diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-25 14:08:29 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-25 14:08:29 +0000 |
commit | 671d53dd3543bf1e2bbc7b9784f3481a4922aa9f (patch) | |
tree | 8230338e021de4e331175a5832e17231c5209e7c /pkgs/stdenv/generic/default.nix | |
parent | 5175cce9a948fbf4f31eaf1c1f630677c5844e1f (diff) | |
download | nixpkgs-671d53dd3543bf1e2bbc7b9784f3481a4922aa9f.tar nixpkgs-671d53dd3543bf1e2bbc7b9784f3481a4922aa9f.tar.gz nixpkgs-671d53dd3543bf1e2bbc7b9784f3481a4922aa9f.tar.bz2 nixpkgs-671d53dd3543bf1e2bbc7b9784f3481a4922aa9f.tar.lz nixpkgs-671d53dd3543bf1e2bbc7b9784f3481a4922aa9f.tar.xz nixpkgs-671d53dd3543bf1e2bbc7b9784f3481a4922aa9f.tar.zst nixpkgs-671d53dd3543bf1e2bbc7b9784f3481a4922aa9f.zip |
* Allow the user to install stdenv (nix-env -i stdenv) and get all the
packages in the stdenv as propagated user environment packages. svn path=/nixpkgs/branches/stdenv-updates/; revision=15300
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
-rw-r--r-- | pkgs/stdenv/generic/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index cf3bbe7e5f6..1a1f588c16a 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -7,7 +7,9 @@ fetchurlBoot }: -let { +let + + lib = import ../../lib; stdenvGenerator = setupScript: rec { @@ -27,6 +29,9 @@ let { # TODO: make this more elegant. inherit param1 param2 param3 param4 param5; + + propagatedUserEnvPkgs = [gcc] ++ + lib.filter lib.isDerivation initialPath; } // { @@ -79,7 +84,7 @@ let { # For convenience, bring in the library functions in lib/ so # packages don't have to do that themselves. - lib = import ../../lib; + inherit lib; inherit fetchurlBoot; @@ -94,6 +99,4 @@ let { }.result; - body = stdenvGenerator ./setup.sh; - -} +in stdenvGenerator ./setup.sh |