diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-08-06 10:34:34 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-08-06 10:34:34 +0000 |
| commit | a1e834e85ade13317ed51853b600d5df5a870d50 (patch) | |
| tree | bff6ce9d58075b6281c53487cd40644854c61233 /pkgs/stdenv/generic/default.nix | |
| parent | d8ba69a16eebb64328287ac997e7f6d3019476a5 (diff) | |
| download | nixpkgs-a1e834e85ade13317ed51853b600d5df5a870d50.tar nixpkgs-a1e834e85ade13317ed51853b600d5df5a870d50.tar.gz nixpkgs-a1e834e85ade13317ed51853b600d5df5a870d50.tar.bz2 nixpkgs-a1e834e85ade13317ed51853b600d5df5a870d50.tar.lz nixpkgs-a1e834e85ade13317ed51853b600d5df5a870d50.tar.xz nixpkgs-a1e834e85ade13317ed51853b600d5df5a870d50.tar.zst nixpkgs-a1e834e85ade13317ed51853b600d5df5a870d50.zip | |
* Get rid of the ugly `useFromStdenv' hack in all-packages.nix.
Instead, use the generic package override mechanism to use packages from earlier bootstrap phases. * Don't rely on the existence of attributes such as `stdenv.coreutils'. svn path=/nixpkgs/trunk/; revision=22991
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 4b988ef524a..585bb2f7fe1 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,6 +1,6 @@ { system, name, preHook ? null, postHook ? null, initialPath, gcc, shell , param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? "" -, extraAttrs ? {} +, extraAttrs ? {}, overrides ? {} , # The `fetchurl' to use for downloading curl and its dependencies # (see all-packages.nix). @@ -118,6 +118,7 @@ let inherit fetchurlBoot; + inherit overrides; } # Propagate any extra attributes. For instance, we use this to |