diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-09 19:07:20 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-09 19:07:31 +0200 |
| commit | 5a98b9f5140578d8cbd4db8bddfe01e24249c2a9 (patch) | |
| tree | ac2552b31325f3d262bd8728d7fd2e23db6ad5c8 /pkgs/stdenv | |
| parent | 5e37c09f0664eb6583dbe30351cc3d21f1b4cadb (diff) | |
| parent | e1a0d45d0046cc01388b98ab88cfe39b2f38fb88 (diff) | |
Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index b16c51f7580bc..78e5b84a841e5 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -9,6 +9,7 @@ import ../generic rec { export NIX_IGNORE_LD_THROUGH_GCC=1 if [ "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin" ]; then + export NIX_ENFORCE_PURITY= export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 dontFixLibtool=1 |