cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #212714 from wegank/aarch64-gcc-comments

Browse source 
treewide: mark #201254
This commit is contained in:
Weijia Wang 2023-01-26 15:38:04 +01:00 committed by GitHub
commit dcd69bc308
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -471,6 +471,7 @@ buildStdenv.mkDerivation ({
separateDebugInfo = enableDebugSymbols; separateDebugInfo = enableDebugSymbols;
enableParallelBuilding = true; enableParallelBuilding = true;
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
# tests were disabled in configureFlags # tests were disabled in configureFlags

1
pkgs/applications/science/misc/root/default.nix
View file

@ -207,6 +207,7 @@ stdenv.mkDerivation rec {
"-Druntime_cxxmodules=OFF" "-Druntime_cxxmodules=OFF"
]; ];
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; 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}. # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.

1
pkgs/development/interpreters/spidermonkey/common.nix
View file

@ -149,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: rec {
# while we have a double-float toolchain # while we have a double-float toolchain
NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; 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; NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null;
postPatch = lib.optionalString (lib.versionOlder version "102") '' postPatch = lib.optionalString (lib.versionOlder version "102") ''

1
pkgs/development/libraries/bobcat/default.nix
View file

@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
''; '';
# have to link to static gcc lib on aarch64-linux explicitly # 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"; NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc";
buildPhase = '' buildPhase = ''

2
pkgs/top-level/all-packages.nix
View file

@ -8618,6 +8618,7 @@ with pkgs;
kakoune-unwrapped = callPackage ../applications/editors/kakoune { kakoune-unwrapped = callPackage ../applications/editors/kakoune {
# See comments on https://github.com/NixOS/nixpkgs/pull/198836 # See comments on https://github.com/NixOS/nixpkgs/pull/198836
# Remove below when stdenv for linux-aarch64 become recent enough. # 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; stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;
}; };
kakoune = wrapKakoune kakoune-unwrapped { kakoune = wrapKakoune kakoune-unwrapped {
@ -30618,6 +30619,7 @@ with pkgs;
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv;
}; };