b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gcc12: fix build with libxcrypt

Browse source
This commit is contained in:
Martin Weinelt 2022-09-29 19:02:02 +02:00
parent aac6de8d31
commit 21c552eaf6
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/compilers/gcc/12/default.nix
View file

@ -26,6 +26,7 @@
, gnused ? null , gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places , cloog # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages , buildPackages
, libxcrypt
}: }:
# Make sure we get GNU sed. # Make sure we get GNU sed.
@ -173,7 +174,7 @@ stdenv.mkDerivation ({
++ optional targetPlatform.isLinux patchelf; ++ optional targetPlatform.isLinux patchelf;
buildInputs = [ buildInputs = [
gmp mpfr libmpc gmp mpfr libmpc libxcrypt
targetPackages.stdenv.cc.bintools # For linking code at run-time targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl) ] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib) ++ (optional (zlib != null) zlib)
@ -183,10 +184,13 @@ stdenv.mkDerivation ({
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
preConfigure = import ../common/pre-configure.nix {
preConfigure = (import ../common/pre-configure.nix {
inherit lib; inherit lib;
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib; inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;
}; }) + ''
ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h
'';
dontDisableStatic = true; dontDisableStatic = true;