diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-19 15:56:17 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-19 15:56:17 +0000 |
| commit | ee45e160b1fc2a8d32233bd7647e5e5fb72a486a (patch) | |
| tree | fc768fb08125e1829f895732ba32a807942efba7 /pkgs/stdenv/nix | |
| parent | 6208059079571059cdf462942584efa88f37b52e (diff) | |
* Prepend the "prehook" rather than sourcing it.
* Don't call xargs with the -r flag in the Darwin bootstrap.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31703
Diffstat (limited to 'pkgs/stdenv/nix')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/stdenv/nix/prehook.sh | 10 |
2 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 5b1b2af8285f..b7411290f9fd 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -2,7 +2,21 @@ import ../generic { name = "stdenv-nix"; - preHook = ./prehook.sh; + + preHook = + '' + export NIX_ENFORCE_PURITY=1 + export NIX_IGNORE_LD_THROUGH_GCC=1 + + if [ "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin" ]; then + export NIX_DONT_SET_RPATH=1 + export NIX_NO_SELF_RPATH=1 + dontFixLibtool=1 + stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" + xargsFlags=" " + fi + ''; + initialPath = (import ../common-path.nix) {pkgs = pkgs;}; system = stdenv.system; diff --git a/pkgs/stdenv/nix/prehook.sh b/pkgs/stdenv/nix/prehook.sh deleted file mode 100644 index ea80355f6bb1..000000000000 --- a/pkgs/stdenv/nix/prehook.sh +++ /dev/null @@ -1,10 +0,0 @@ -export NIX_ENFORCE_PURITY=1 -export NIX_IGNORE_LD_THROUGH_GCC=1 - -if test "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin"; then - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " -fi |