about summary refs log tree commit diff
path: root/pkgs/stdenv/linux/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-06-18 15:09:13 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-06-18 15:09:13 +0000
commit7bf0c5ba012198ca529de76c215f5ef5ea474cb4 (patch)
tree07e7d78b8c088706e6d563e7583d287904a32a3c /pkgs/stdenv/linux/default.nix
parentaab9aee56ef90e2e75c70e2b7e27445b559e0cbc (diff)
downloadnixlib-7bf0c5ba012198ca529de76c215f5ef5ea474cb4.tar
nixlib-7bf0c5ba012198ca529de76c215f5ef5ea474cb4.tar.gz
nixlib-7bf0c5ba012198ca529de76c215f5ef5ea474cb4.tar.bz2
nixlib-7bf0c5ba012198ca529de76c215f5ef5ea474cb4.tar.lz
nixlib-7bf0c5ba012198ca529de76c215f5ef5ea474cb4.tar.xz
nixlib-7bf0c5ba012198ca529de76c215f5ef5ea474cb4.tar.zst
nixlib-7bf0c5ba012198ca529de76c215f5ef5ea474cb4.zip
* Folded the Cygwin, powerpc-darwin and FreeBSD stdenv into the "native"
  stdenv.

svn path=/nixpkgs/trunk/; revision=12147
Diffstat (limited to 'pkgs/stdenv/linux/default.nix')
-rw-r--r--pkgs/stdenv/linux/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index fdb7326958ea..eea8cf04e584 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -114,7 +114,7 @@ rec {
       shell = bootstrapTools.bash;
       initialPath = [staticTools] ++ extraPath;
       inherit fetchurlBoot;
-      extraAttrs = extraAttrs // {fetchurl = fetchurlBoot;};
+      forceFetchurlBoot = true;
       inherit gcc;
     };
 
@@ -211,6 +211,7 @@ rec {
     shell = stdenvLinuxBoot3Pkgs.bash + "/bin/sh";
     
     fetchurlBoot = stdenvLinuxBoot3.fetchurlBoot;
+    forceFetchurlBoot = false;
     
     extraAttrs = {
       inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */ glibc;