libcosmicAppHook: use RUSTFLAGS instead of platform specific flags#464981
Merged
Aleksanaa merged 1 commit intoNixOS:masterfrom Nov 26, 2025
Merged
libcosmicAppHook: use RUSTFLAGS instead of platform specific flags#464981Aleksanaa merged 1 commit intoNixOS:masterfrom
Aleksanaa merged 1 commit intoNixOS:masterfrom
Conversation
This ensures these flags are picked up correctly, after latest rust update. We can revert this if we solve the root cause later. See NixOS#464392
alyssais
reviewed
Nov 25, 2025
|
|
||
| # Temporarily use this simpler solution, it should work for simple cross compilation | ||
| # https://github.com/NixOS/nixpkgs/issues/464392 | ||
| local flags="RUSTFLAGS" |
Member
There was a problem hiding this comment.
I don't think it will? It'll cause build scripts to try to link a bunch of libraries that won't be present for the build platform.
We need to understand what's actually changed here and why.
Member
Author
There was a problem hiding this comment.
From a simple search, we can see that this is the only one in nixpkgs that uses platform-specific RUSTFLAGS, while others only use RUSTFLAGS:
https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/li/libkrun/package.nix
https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/as/asusctl/package.nix
https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/al/alvr/package.nix
https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/wo/woomer/package.nix
https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/ve/veridian/package.nix
https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/mi/miro/package.nix
Member
There was a problem hiding this comment.
If the --target flag (or build.target) is used, then the flags will only be passed to the compiler for the target. Things being built for the host, such as build scripts or proc macros, will not receive the args. Without --target, the flags will be passed to all compiler invocations (including build scripts and proc macros) because dependencies are shared. If you have args that you do not want to pass to build scripts or proc macros and are building for the host, pass --target with the host triple.
Okay, so we just end up with extra linkage on build scripts and proc macros. That would still be best avoided, and so we should still be using the target-specific variables across the board once we figure out how to make them work again, but it's not urgent.
Member
|
@ofborg test cosmic |
Member
|
If this does fix the issue it should be backported |
Member
|
I can confirm that |
Pandapip1
approved these changes
Nov 25, 2025
Contributor
|
Successfully created backport PR for |
3 tasks
19 tasks
33 tasks
3 tasks
brianmcgillion
added a commit
to tiiuae/nixpkgs
that referenced
this pull request
Dec 3, 2025
…flags (NixOS#464981)" This reverts commit d2c6221. PR NixOS#464981 changed libcosmicAppHook to use the global RUSTFLAGS instead of target-specific CARGO_TARGET_*_RUSTFLAGS as a workaround for issue PR NixOS#464392. However, this broke cross-compilation for packages using the crabtime procedural macro (like cosmic-initial-setup). The root cause was that buildRustPackage was always setting env.RUSTFLAGS, which shadowed the target-specific flags. This has been fixed in commit PR NixOS#464707, which only sets RUSTFLAGS when explicitly needed. Fixes cross-compilation of cosmic-initial-setup and other cosmic packages that use crabtime proc macros. Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
brianmcgillion
added a commit
to tiiuae/nixpkgs
that referenced
this pull request
Dec 7, 2025
…flags (NixOS#464981)" This reverts commit d2c6221. PR NixOS#464981 changed libcosmicAppHook to use the global RUSTFLAGS instead of target-specific CARGO_TARGET_*_RUSTFLAGS as a workaround for issue PR NixOS#464392. However, this broke cross-compilation for packages using the crabtime procedural macro (like cosmic-initial-setup). The root cause was that buildRustPackage was always setting env.RUSTFLAGS, which shadowed the target-specific flags. This has been fixed in commit PR NixOS#464707, which only sets RUSTFLAGS when explicitly needed. Fixes cross-compilation of cosmic-initial-setup and other cosmic packages that use crabtime proc macros. Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
brianmcgillion
added a commit
to tiiuae/nixpkgs
that referenced
this pull request
Dec 11, 2025
…flags (NixOS#464981)" This reverts commit d2c6221. PR NixOS#464981 changed libcosmicAppHook to use the global RUSTFLAGS instead of target-specific CARGO_TARGET_*_RUSTFLAGS as a workaround for issue PR NixOS#464392. However, this broke cross-compilation for packages using the crabtime procedural macro (like cosmic-initial-setup). The root cause was that buildRustPackage was always setting env.RUSTFLAGS, which shadowed the target-specific flags. This has been fixed in commit PR NixOS#464707, which only sets RUSTFLAGS when explicitly needed. Fixes cross-compilation of cosmic-initial-setup and other cosmic packages that use crabtime proc macros. Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
brianmcgillion
added a commit
to tiiuae/nixpkgs
that referenced
this pull request
Dec 13, 2025
…flags (NixOS#464981)" This reverts commit d2c6221. PR NixOS#464981 changed libcosmicAppHook to use the global RUSTFLAGS instead of target-specific CARGO_TARGET_*_RUSTFLAGS as a workaround for issue PR NixOS#464392. However, this broke cross-compilation for packages using the crabtime procedural macro (like cosmic-initial-setup). The root cause was that buildRustPackage was always setting env.RUSTFLAGS, which shadowed the target-specific flags. This has been fixed in commit PR NixOS#464707, which only sets RUSTFLAGS when explicitly needed. Fixes cross-compilation of cosmic-initial-setup and other cosmic packages that use crabtime proc macros. Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
brianmcgillion
added a commit
to tiiuae/nixpkgs
that referenced
this pull request
Dec 16, 2025
…flags (NixOS#464981)" This reverts commit d2c6221. PR NixOS#464981 changed libcosmicAppHook to use the global RUSTFLAGS instead of target-specific CARGO_TARGET_*_RUSTFLAGS as a workaround for issue PR NixOS#464392. However, this broke cross-compilation for packages using the crabtime procedural macro (like cosmic-initial-setup). The root cause was that buildRustPackage was always setting env.RUSTFLAGS, which shadowed the target-specific flags. This has been fixed in commit PR NixOS#464707, which only sets RUSTFLAGS when explicitly needed. Fixes cross-compilation of cosmic-initial-setup and other cosmic packages that use crabtime proc macros. Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
brianmcgillion
added a commit
to tiiuae/nixpkgs
that referenced
this pull request
Dec 31, 2025
…flags (NixOS#464981)" This reverts commit d2c6221. PR NixOS#464981 changed libcosmicAppHook to use the global RUSTFLAGS instead of target-specific CARGO_TARGET_*_RUSTFLAGS as a workaround for issue PR NixOS#464392. However, this broke cross-compilation for packages using the crabtime procedural macro (like cosmic-initial-setup). The root cause was that buildRustPackage was always setting env.RUSTFLAGS, which shadowed the target-specific flags. This has been fixed in commit PR NixOS#464707, which only sets RUSTFLAGS when explicitly needed. Fixes cross-compilation of cosmic-initial-setup and other cosmic packages that use crabtime proc macros. Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This ensures these flags are picked up correctly, after latest rust update. We can revert this if we solve the root cause later.
See #464392
Temporary fix? But a fix, anyway. Tested
cosmic-settingsandcosmic-edit, the rpath and NEEDED libraries forlibEGL.so.1and others are added correctly.Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.