From 7bf0c5ba012198ca529de76c215f5ef5ea474cb4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jun 2008 15:09:13 +0000 Subject: * Folded the Cygwin, powerpc-darwin and FreeBSD stdenv into the "native" stdenv. svn path=/nixpkgs/trunk/; revision=12147 --- pkgs/stdenv/linux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/stdenv/linux/default.nix') 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; -- cgit 1.4.1