diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-26 21:38:58 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-26 21:38:58 +0100 |
| commit | 635880a17aa3efb14869ba80a5785f8663dee6e9 (patch) | |
| tree | d8ae94c8522cf847100c9f9cc4bce4d04ca3eed9 /pkgs/stdenv/generic | |
| parent | 1af2ada7d4c61e79356a0f3f8bcced6159a6e751 (diff) | |
| download | nixpkgs-635880a17aa3efb14869ba80a5785f8663dee6e9.tar nixpkgs-635880a17aa3efb14869ba80a5785f8663dee6e9.tar.gz nixpkgs-635880a17aa3efb14869ba80a5785f8663dee6e9.tar.bz2 nixpkgs-635880a17aa3efb14869ba80a5785f8663dee6e9.tar.lz nixpkgs-635880a17aa3efb14869ba80a5785f8663dee6e9.tar.xz nixpkgs-635880a17aa3efb14869ba80a5785f8663dee6e9.tar.zst nixpkgs-635880a17aa3efb14869ba80a5785f8663dee6e9.zip | |
2nd approach at getting a check for /niximpure in stdenv-updates
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index fd4c17ca251..81e11c2df65 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -13,6 +13,10 @@ sed -e "s^@initialPath@^$initialPath^g" \ -e "s^@gcc@^$gcc^g" \ -e "s^@shell@^$shell^g" \ < $out/setup > $out/setup.tmp +if [ -n "$withNixImpure" ]; then + sed -i -e 's^@niximpure@^test -f /niximupure/impure.sh && . /niximpure/impure.sh^g' \ + $out/setup.tmp +fi mv $out/setup.tmp $out/setup # Allow the user to install stdenv using nix-env and get the packages diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 20cbb1b455c..0494d6f00f5 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 e30b0656e62..230694ccf35 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. |