diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 13:26:51 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 13:26:51 +0100 |
| commit | 97e9d2b3512eca5ec89eafe391efac98b101831b (patch) | |
| tree | 671db1ee8aaa5b77b72cbce8fadb8a77405febbf /pkgs/stdenv/nix | |
| parent | 9a979af1d3bf92e7ebe85332852b2c95bdf0aa04 (diff) | |
| download | nixpkgs-97e9d2b3512eca5ec89eafe391efac98b101831b.tar nixpkgs-97e9d2b3512eca5ec89eafe391efac98b101831b.tar.gz nixpkgs-97e9d2b3512eca5ec89eafe391efac98b101831b.tar.bz2 nixpkgs-97e9d2b3512eca5ec89eafe391efac98b101831b.tar.lz nixpkgs-97e9d2b3512eca5ec89eafe391efac98b101831b.tar.xz nixpkgs-97e9d2b3512eca5ec89eafe391efac98b101831b.tar.zst nixpkgs-97e9d2b3512eca5ec89eafe391efac98b101831b.zip | |
Remove dead code
Diffstat (limited to 'pkgs/stdenv/nix')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index c7dd659195b..476e0eae397 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -7,17 +7,6 @@ import ../generic rec { '' export NIX_ENFORCE_PURITY=1 export NIX_IGNORE_LD_THROUGH_GCC=1 - '' + lib.optionalString stdenv.isDarwin '' - export NIX_ENFORCE_PURITY= - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " - export MACOSX_DEPLOYMENT_TARGET=10.6 - 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" ''; initialPath = (import ../common-path.nix) {pkgs = pkgs;}; @@ -29,11 +18,7 @@ import ../generic rec { nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr"; nativeLibc = true; inherit stdenv; - binutils = - if stdenv.isDarwin then - import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;} - else - pkgs.binutils; + binutils = pkgs.binutils; gcc = pkgs.gcc.gcc; coreutils = pkgs.coreutils; shell = pkgs.bash + "/bin/sh"; |