summary refs log tree commit diff
path: root/pkgs/system/stdenvs.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2004-03-27 15:50:18 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2004-03-27 15:50:18 +0000
commit9c4cfc02ce8756c89563740cda5e733db985c13f (patch)
tree4eb21c912bdc30af9791fc971c6552f2c2da799c /pkgs/system/stdenvs.nix
parentf1b459adfd4687f59bb395f27188b8ca646dfabd (diff)
downloadnixpkgs-9c4cfc02ce8756c89563740cda5e733db985c13f.tar
nixpkgs-9c4cfc02ce8756c89563740cda5e733db985c13f.tar.gz
nixpkgs-9c4cfc02ce8756c89563740cda5e733db985c13f.tar.bz2
nixpkgs-9c4cfc02ce8756c89563740cda5e733db985c13f.tar.lz
nixpkgs-9c4cfc02ce8756c89563740cda5e733db985c13f.tar.xz
nixpkgs-9c4cfc02ce8756c89563740cda5e733db985c13f.tar.zst
nixpkgs-9c4cfc02ce8756c89563740cda5e733db985c13f.zip
* Pass a `bootCurl' parameter.
svn path=/nixpkgs/trunk/; revision=857
Diffstat (limited to 'pkgs/system/stdenvs.nix')
-rw-r--r--pkgs/system/stdenvs.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/system/stdenvs.nix b/pkgs/system/stdenvs.nix
index d8006ddb829..798091a9f2e 100644
--- a/pkgs/system/stdenvs.nix
+++ b/pkgs/system/stdenvs.nix
@@ -74,7 +74,10 @@
   };
 
   # 5) These packages should be pure.
-  stdenvLinuxBoot2Pkgs = allPackages {stdenv = stdenvLinuxBoot2;};
+  stdenvLinuxBoot2Pkgs = allPackages {
+    stdenv = stdenvLinuxBoot2;
+    bootCurl = stdenvLinuxBoot1Pkgs.curl;
+  };
 
   # 6) So finally we can construct the Nix build environment.
   stdenvLinux = (import ../stdenv/nix-linux) {
@@ -87,7 +90,10 @@
   # 7) And we can build all packages against that, but we don't
   #    rebuild stuff from step 6.
   stdenvLinuxPkgs =
-    allPackages {stdenv = stdenvLinux;} //
+    allPackages {
+      stdenv = stdenvLinux;
+      bootCurl = stdenvLinuxBoot2Pkgs.curl;
+    } //
     {inherit (stdenvLinuxBoot2Pkgs)
       gzip bzip2 bash binutils coreutils diffutils findutils gawk gcc
       gnumake gnused gnutar gnugrep wget;