public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv: don't overwrite $NIX_ENFORCE_PURITY setting

Browse Source 
Close #13583.
This commit is contained in:
Tim Cuthbertson 2016-02-29 22:10:26 +11:00 committed by Vladimír Čunát
parent 116215372e
commit d05a3cd763
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/stdenv/darwin/default.nix
View File

@ -25,7 +25,7 @@ in rec {
allPackages = import ../../top-level/all-packages.nix; allPackages = import ../../top-level/all-packages.nix;
commonPreHook = '' commonPreHook = ''
export NIX_ENFORCE_PURITY=1 export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
export NIX_IGNORE_LD_THROUGH_GCC=1 export NIX_IGNORE_LD_THROUGH_GCC=1
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
export MACOSX_DEPLOYMENT_TARGET=10.7 export MACOSX_DEPLOYMENT_TARGET=10.7

2
pkgs/stdenv/linux/default.nix
View File

@ -22,7 +22,7 @@ rec {
commonPreHook = commonPreHook =
'' ''
export NIX_ENFORCE_PURITY=1 export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""} ${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""}
${if system == "mips64el-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""} ${if system == "mips64el-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
''; '';

2
pkgs/stdenv/nix/default.nix
View File

@ -5,7 +5,7 @@ import ../generic rec {
preHook = preHook =
'' ''
export NIX_ENFORCE_PURITY=1 export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}"
export NIX_IGNORE_LD_THROUGH_GCC=1 export NIX_IGNORE_LD_THROUGH_GCC=1
''; '';