Skip to content

Commit 0c72fb5

Browse files
Pandapip1github-actions[bot]
authored andcommitted
Revert "libcosmicAppHook: use RUSTFLAGS instead of platform specific flags"
This reverts commit d2c6221. This is no longer needed in staging due to the proper fix #464707 having been merged (cherry picked from commit ea27ed7)
1 parent a530b8a commit 0c72fb5

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ libcosmicAppVergenHook() {
1515

1616
libcosmicAppLinkerArgsHook() {
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

pkgs/by-name/li/libcosmicAppHook/package.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff 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
[

0 commit comments

Comments
 (0)