diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-27 15:10:55 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-27 15:10:55 +0000 |
| commit | c41881842b316c1e38e54b00bee1770f9eb5eb2c (patch) | |
| tree | 05deb044bd19c20058d65e4830b227b72c8e1646 /pkgs/stdenv/generic | |
| parent | d05b33653e6376124f39984a56c92295b8a65e24 (diff) | |
| parent | 636303797fa55c6c99de11d3c5a6ff3657fe4ecd (diff) | |
| download | nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar.gz nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar.bz2 nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar.lz nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar.xz nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.tar.zst nixlib-c41881842b316c1e38e54b00bee1770f9eb5eb2c.zip | |
Merge branch 'stdenv-updates' into pi-stdenv-updates
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index fd4c17ca2519..6274200900cc 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -9,9 +9,15 @@ mkdir $out echo "$preHook" > $out/setup cat "$setup" >> $out/setup +if [ "$withNixImpure" == 1 ]; then + # sed wants \&\& for a && + niximpure='test -f /niximpure/impure.sh \&\& . /niximpure/impure.sh' +fi + sed -e "s^@initialPath@^$initialPath^g" \ -e "s^@gcc@^$gcc^g" \ -e "s^@shell@^$shell^g" \ + -e "s^@niximpure@^$niximpure^g" \ < $out/setup > $out/setup.tmp mv $out/setup.tmp $out/setup diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index ea101ddb075c..d85d9dfc06af 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,5 +1,6 @@ { system, name ? "stdenv", preHook ? "", initialPath, gcc, shell , extraAttrs ? {}, overrides ? (pkgs: {}) +, withNixImpure ? false , # The `fetchurl' to use for downloading curl and its dependencies # (see all-packages.nix). @@ -26,7 +27,7 @@ let setup = setupScript; - inherit preHook initialPath gcc shell; + inherit preHook initialPath gcc shell withNixImpure; propagatedUserEnvPkgs = [gcc] ++ lib.filter lib.isDerivation initialPath; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index e30b0656e623..230694ccf35c 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -270,6 +270,7 @@ elif [ "$NIX_BUILD_CORES" -le 0 ]; then fi export NIX_BUILD_CORES +@niximpure@ ###################################################################### # Misc. helper functions. |