Skip to content

Revert "libcosmicAppHook: use RUSTFLAGS instead of platform specific flags" #468250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Aleksanaa merged 1 commit into from
Dec 6, 2025
Merged

Revert "libcosmicAppHook: use RUSTFLAGS instead of platform specific flags" #468250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ libcosmicAppVergenHook() {

libcosmicAppLinkerArgsHook() {
# Force linking to certain libraries like libEGL, which are always dlopen()ed
# local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS"

# Temporarily use this simpler solution, it should work for simple cross compilation
# https://github.com/NixOS/nixpkgs/issues/464392
local flags="RUSTFLAGS"
local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS"

export "$flags"="${!flags-} -C link-arg=-Wl,--push-state,--no-as-needed"
# shellcheck disable=SC2043
Expand Down
5 changes: 1 addition & 4 deletions pkgs/by-name/li/libcosmicAppHook/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,7 @@ makeSetupHook {
lib.makeSearchPath "share" (
lib.optionals includeSettings [ fallbackThemes ] ++ [ targetPackages.cosmic-icons ]
);
# Temporarily using RUSTFLAGS: https://github.com/NixOS/nixpkgs/issues/464392
# See ./libcosmic-app-hook.sh
# cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget;

cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget;
# force linking for all libraries that may be dlopen'd by libcosmic/iced apps
cargoLinkLibs = lib.escapeShellArgs (
[
Expand Down
Loading