Skip to content

Commit

Permalink
treewide: mark #201254
Browse files Browse the repository at this point in the history
  • Loading branch information
wegank committed Jan 26, 2023
1 parent 6ace112 commit 52a2870
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions pkgs/applications/networking/browsers/firefox/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ buildStdenv.mkDerivation ({
separateDebugInfo = enableDebugSymbols;
enableParallelBuilding = true;

# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;

# tests were disabled in configureFlags
Expand Down
1 change: 1 addition & 0 deletions pkgs/applications/science/misc/root/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ stdenv.mkDerivation rec {
"-Druntime_cxxmodules=OFF"
];

# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";

# Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/interpreters/spidermonkey/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: rec {
# while we have a double-float toolchain
NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d";

# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;

postPatch = lib.optionalString (lib.versionOlder version "102") ''
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/libraries/bobcat/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
'';

# have to link to static gcc lib on aarch64-linux explicitly
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";

buildPhase = ''
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8617,6 +8617,7 @@ with pkgs;
kakoune-unwrapped = callPackage ../applications/editors/kakoune {
# See comments on https://github.com/NixOS/nixpkgs/pull/198836
# Remove below when stdenv for linux-aarch64 become recent enough.
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;
};
kakoune = wrapKakoune kakoune-unwrapped {
Expand Down Expand Up @@ -30610,6 +30611,7 @@ with pkgs;
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };

ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv;
};

Expand Down

0 comments on commit 52a2870

Please sign in to comment.