talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #250500 from trofi/fix-buildFHSEnv-BINTOOLS-wrapper

Browse Source 
buildFHSEnv: fix `NIX_LDFLAGS` propagation to `ld` wrapper
This commit is contained in:
Atemu
2023-08-31 18:58:34 +02:00
committed by GitHub
parent da938d190e 2da0307220
commit 4867914ee3
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
View File

@@ -105,6 +105,7 @@ let
# Force compilers and other tools to look in default search paths
unset NIX_ENFORCE_PURITY
export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1
export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1
export NIX_CFLAGS_COMPILE='-idirafter /usr/include'
export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32'

1
pkgs/build-support/build-fhsenv-chroot/env.nix
View File

@@ -78,6 +78,7 @@ let
# Force compilers and other tools to look in default search paths
unset NIX_ENFORCE_PURITY
export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1
export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1
export NIX_CFLAGS_COMPILE='-idirafter /usr/include'
export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32'