diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 17:21:32 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 12:45:18 +0200 |
| commit | be3fc3ae2f3a782226d2b8b8ec36c37f18fa12a3 (patch) | |
| tree | 990cd9bae60e30d18b68fcf5a18d44597885e796 /pkgs/stdenv/nix/default.nix | |
| parent | cd948c093faef02b964f15a973313129fb029613 (diff) | |
| download | nixlib-be3fc3ae2f3a782226d2b8b8ec36c37f18fa12a3.tar nixlib-be3fc3ae2f3a782226d2b8b8ec36c37f18fa12a3.tar.gz nixlib-be3fc3ae2f3a782226d2b8b8ec36c37f18fa12a3.tar.bz2 nixlib-be3fc3ae2f3a782226d2b8b8ec36c37f18fa12a3.tar.lz nixlib-be3fc3ae2f3a782226d2b8b8ec36c37f18fa12a3.tar.xz nixlib-be3fc3ae2f3a782226d2b8b8ec36c37f18fa12a3.tar.zst nixlib-be3fc3ae2f3a782226d2b8b8ec36c37f18fa12a3.zip | |
Prevent an unnecessary evaluation of lib
Diffstat (limited to 'pkgs/stdenv/nix/default.nix')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index a496a819a6df..c7dd659195be 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, config }: +{ stdenv, pkgs, config, lib }: import ../generic rec { inherit config; @@ -7,7 +7,7 @@ import ../generic rec { '' export NIX_ENFORCE_PURITY=1 export NIX_IGNORE_LD_THROUGH_GCC=1 - '' + (if stdenv.isDarwin then '' + '' + lib.optionalString stdenv.isDarwin '' export NIX_ENFORCE_PURITY= export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 @@ -18,7 +18,7 @@ import ../generic rec { export SDKROOT=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true) export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" - '' else ""); + ''; initialPath = (import ../common-path.nix) {pkgs = pkgs;}; |