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/linux | |
| parent | 6208059079571059cdf462942584efa88f37b52e (diff) | |
| download | nixlib-ee45e160b1fc2a8d32233bd7647e5e5fb72a486a.tar nixlib-ee45e160b1fc2a8d32233bd7647e5e5fb72a486a.tar.gz nixlib-ee45e160b1fc2a8d32233bd7647e5e5fb72a486a.tar.bz2 nixlib-ee45e160b1fc2a8d32233bd7647e5e5fb72a486a.tar.lz nixlib-ee45e160b1fc2a8d32233bd7647e5e5fb72a486a.tar.xz nixlib-ee45e160b1fc2a8d32233bd7647e5e5fb72a486a.tar.zst nixlib-ee45e160b1fc2a8d32233bd7647e5e5fb72a486a.zip | |
* 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/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/scripts/prehook.sh | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 9937fd5db6ef..90ce61b25c88 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -55,10 +55,10 @@ rec { builder = bootstrapFiles.sh; - args = if (system == "armv5tel-linux") then - ([ ./scripts/unpack-bootstrap-tools-arm.sh ]) - else - ([ ./scripts/unpack-bootstrap-tools.sh ]); + args = + if system == "armv5tel-linux" + then [ ./scripts/unpack-bootstrap-tools-arm.sh ] + else [ ./scripts/unpack-bootstrap-tools.sh ]; inherit (bootstrapFiles) bzip2 mkdir curl cpio; @@ -82,7 +82,7 @@ rec { import ../generic { inherit system; name = "stdenv-linux-boot"; - preHook = builtins.toFile "prehook.sh" + preHook = '' # Don't patch #!/interpreter because it leads to retained # dependencies on the bootstrapTools in the final stdenv. @@ -263,7 +263,7 @@ rec { inherit system; - preHook = builtins.toFile "prehook.sh" commonPreHook; + preHook = commonPreHook; initialPath = ((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;}) diff --git a/pkgs/stdenv/linux/scripts/prehook.sh b/pkgs/stdenv/linux/scripts/prehook.sh deleted file mode 100644 index 29c02e2eaf2e..000000000000 --- a/pkgs/stdenv/linux/scripts/prehook.sh +++ /dev/null @@ -1,3 +0,0 @@ -export NIX_ENFORCE_PURITY=1 - -havePatchELF=1 |