File tree Expand file tree Collapse file tree 2 files changed +2
-9
lines changed
pkgs/by-name/li/libcosmicAppHook Expand file tree Collapse file tree 2 files changed +2
-9
lines changed Original file line number Diff line number Diff line change @@ -15,11 +15,7 @@ libcosmicAppVergenHook() {
1515
1616libcosmicAppLinkerArgsHook () {
1717 # Force linking to certain libraries like libEGL, which are always dlopen()ed
18- # local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS"
19-
20- # Temporarily use this simpler solution, it should work for simple cross compilation
21- # https://github.com/NixOS/nixpkgs/issues/464392
22- local flags=" RUSTFLAGS"
18+ local flags=" CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS"
2319
2420 export " $flags " =" ${! flags-} -C link-arg=-Wl,--push-state,--no-as-needed"
2521 # shellcheck disable=SC2043
Original file line number Diff line number Diff line change @@ -55,10 +55,7 @@ makeSetupHook {
5555 lib . makeSearchPath "share" (
5656 lib . optionals includeSettings [ fallbackThemes ] ++ [ targetPackages . cosmic-icons ]
5757 ) ;
58- # Temporarily using RUSTFLAGS: https://github.com/NixOS/nixpkgs/issues/464392
59- # See ./libcosmic-app-hook.sh
60- # cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget;
61-
58+ cargoLinkerVar = targetPackages . stdenv . hostPlatform . rust . cargoEnvVarTarget ;
6259 # force linking for all libraries that may be dlopen'd by libcosmic/iced apps
6360 cargoLinkLibs = lib . escapeShellArgs (
6461 [
You can’t perform that action at this time.
0 commit comments