diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-02 15:03:38 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-02 15:03:38 +0000 |
| commit | 1dee2d3de0baf12ac4dd700c95c6a4da54bfaaf6 (patch) | |
| tree | 41d0cdffd3840e346797417a210aaac34ff4b04a /pkgs/stdenv/generic/default.nix | |
| parent | 3e727ebe97d37394c06c0de28635535cd527e0ab (diff) | |
| download | nixpkgs-1dee2d3de0baf12ac4dd700c95c6a4da54bfaaf6.tar nixpkgs-1dee2d3de0baf12ac4dd700c95c6a4da54bfaaf6.tar.gz nixpkgs-1dee2d3de0baf12ac4dd700c95c6a4da54bfaaf6.tar.bz2 nixpkgs-1dee2d3de0baf12ac4dd700c95c6a4da54bfaaf6.tar.lz nixpkgs-1dee2d3de0baf12ac4dd700c95c6a4da54bfaaf6.tar.xz nixpkgs-1dee2d3de0baf12ac4dd700c95c6a4da54bfaaf6.tar.zst nixpkgs-1dee2d3de0baf12ac4dd700c95c6a4da54bfaaf6.zip | |
* Fix stdenvNative/stdenvNix.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13957
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 40baec26f94..77e1c20430b 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,7 +1,10 @@ { system, name, preHook ? null, postHook ? null, initialPath, gcc, shell , param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? "" , extraAttrs ? {} -, fetchurlBoot, forceFetchurlBoot + +, # The `fetchurl' to use for downloading curl and its dependencies + # (see all-packages.nix). + fetchurlBoot }: let { @@ -82,9 +85,7 @@ let { # "lift" packages like curl from the final stdenv for Linux to # all-packages.nix for that platform (meaning that it has a line # like curl = if stdenv ? curl then stdenv.curl else ...). - // extraAttrs - - // (if forceFetchurlBoot then {fetchurl = fetchurlBoot;} else {}); + // extraAttrs; }.result; |