diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-30 12:46:52 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-30 12:46:52 +0000 |
| commit | 01a1658c6b8cdf75ad87ea24d1f82bc6c17670d4 (patch) | |
| tree | f47da9f336227f99789f4f819837dcd25cc566c0 /pkgs/stdenv/generic | |
| parent | 68327c3a9dbbea3cd647c509d8cfd2db8ccd0c72 (diff) | |
| download | nixlib-01a1658c6b8cdf75ad87ea24d1f82bc6c17670d4.tar nixlib-01a1658c6b8cdf75ad87ea24d1f82bc6c17670d4.tar.gz nixlib-01a1658c6b8cdf75ad87ea24d1f82bc6c17670d4.tar.bz2 nixlib-01a1658c6b8cdf75ad87ea24d1f82bc6c17670d4.tar.lz nixlib-01a1658c6b8cdf75ad87ea24d1f82bc6c17670d4.tar.xz nixlib-01a1658c6b8cdf75ad87ea24d1f82bc6c17670d4.tar.zst nixlib-01a1658c6b8cdf75ad87ea24d1f82bc6c17670d4.zip | |
* Finally we have a working stdenvLinux again.
On the downside, the build process of stdenvLinux builds gcc 9 times (3 x 3 bootstrap stages). That's a bit excessive. svn path=/nixpkgs/trunk/; revision=880
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/builder.sh | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh index b3d464322499..bbcd19448cb7 100644 --- a/pkgs/stdenv/generic/builder.sh +++ b/pkgs/stdenv/generic/builder.sh @@ -13,6 +13,7 @@ sed \ -e "s^@postHook@^$postHook^g" \ -e "s^@initialPath@^$initialPath^g" \ -e "s^@gcc@^$gcc^g" \ + -e "s^@shell@^$shell^g" \ -e "s^@param1@^$p1^g" \ -e "s^@param2@^$p2^g" \ -e "s^@param3@^$p3^g" \ diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index d7b953ffb056..3aa2d3bfac07 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, name, preHook ? null, postHook ? null, initialPath, gcc, bash +{ stdenv, name, preHook ? null, postHook ? null, initialPath, gcc, shell , param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? "" }: @@ -13,17 +13,17 @@ let { setup = ./setup.sh; - inherit preHook postHook initialPath gcc; + inherit preHook postHook initialPath gcc shell; # TODO: make this more elegant. inherit param1 param2 param3 param4 param5; } # Add a utility function to produce derivations that use this - # stdenv and its the bash shell. + # stdenv and its shell. // { mkDerivation = attrs: derivation (attrs // { - builder = bash; + builder = shell; args = ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)]; stdenv = body; system = body.system; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 074e738dca37..4f1485f224bf 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -15,6 +15,7 @@ fi # Execute the pre-hook. +export SHELL=@shell@ param1=@param1@ param2=@param2@ param3=@param3@ |