diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-23 11:59:51 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-23 12:02:13 +0100 |
| commit | 8470b03db2f7e59f05312974b3aba21c20c63dbe (patch) | |
| tree | fd98c2f16bfa2b51fcfb9283cdd77867e2e60d5a /pkgs/stdenv | |
| parent | 8d685306c5a0fa49e1752118bee71e368452670f (diff) | |
| download | nixlib-8470b03db2f7e59f05312974b3aba21c20c63dbe.tar nixlib-8470b03db2f7e59f05312974b3aba21c20c63dbe.tar.gz nixlib-8470b03db2f7e59f05312974b3aba21c20c63dbe.tar.bz2 nixlib-8470b03db2f7e59f05312974b3aba21c20c63dbe.tar.lz nixlib-8470b03db2f7e59f05312974b3aba21c20c63dbe.tar.xz nixlib-8470b03db2f7e59f05312974b3aba21c20c63dbe.tar.zst nixlib-8470b03db2f7e59f05312974b3aba21c20c63dbe.zip | |
Remove unused file
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/prehook.nix | 9 | ||||
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 8 |
2 files changed, 0 insertions, 17 deletions
diff --git a/pkgs/stdenv/darwin/prehook.nix b/pkgs/stdenv/darwin/prehook.nix deleted file mode 100644 index f38cd517f00e..000000000000 --- a/pkgs/stdenv/darwin/prehook.nix +++ /dev/null @@ -1,9 +0,0 @@ -'' - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " - export MACOSX_DEPLOYMENT_TARGET=10.9 - export SDKROOT=$(/usr/bin/xcrun --sdk macosx10.9 --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" -'' diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 925b90c964f2..935af7d4c36b 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -18,13 +18,6 @@ rec { export NIX_ENFORCE_PURITY= ''; - prehookDarwin = '' - ${prehookBase} - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - ${import ../darwin/prehook.nix} - ''; - prehookFreeBSD = '' ${prehookBase} @@ -77,7 +70,6 @@ rec { import ../generic { preHook = - if system == "x86_64-darwin" then prehookDarwin else if system == "i686-freebsd" then prehookFreeBSD else if system == "x86_64-freebsd" then prehookFreeBSD else if system == "i686-openbsd" then prehookOpenBSD else |