public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19941 from Ericson2314/stdenv-inherit-syntax

Browse Source 
top-level: Make `stdenv/default.nix` more concise with `inherit (expr…
This commit is contained in:
Daniel Peebles 2016-10-28 08:06:10 -04:00 committed by GitHub
commit 46d0af7fec
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/stdenv/default.nix
View File

@ -16,9 +16,7 @@ rec {
# i.e., the stuff in /bin, /usr/bin, etc. This environment should # i.e., the stuff in /bin, /usr/bin, etc. This environment should
# be used with care, since many Nix packages will not build properly # be used with care, since many Nix packages will not build properly
# with it (e.g., because they require GNU Make). # with it (e.g., because they require GNU Make).
stdenvNative = (import ./native { inherit (import ./native { inherit system allPackages config; }) stdenvNative;
inherit system allPackages config;
}).stdenv;
stdenvNativePkgs = allPackages { stdenvNativePkgs = allPackages {
bootStdenv = stdenvNative; bootStdenv = stdenvNative;
@ -33,12 +31,12 @@ rec {
pkgs = stdenvNativePkgs; pkgs = stdenvNativePkgs;
}; };
stdenvFreeBSD = (import ./freebsd { inherit system allPackages platform config; }).stdenvFreeBSD; inherit (import ./freebsd { inherit system allPackages platform config; }) stdenvFreeBSD;
# Linux standard environment. # Linux standard environment.
stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux; inherit (import ./linux { inherit system allPackages platform config lib; }) stdenvLinux;
stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stdenvDarwin; inherit (import ./darwin { inherit system allPackages platform config;}) stdenvDarwin;
# Select the appropriate stdenv for the platform `system'. # Select the appropriate stdenv for the platform `system'.
stdenv = stdenv =

2
pkgs/stdenv/native/default.nix
View File

@ -141,5 +141,5 @@ rec {
}; };
stdenv = stdenvBoot2; stdenvNative = stdenvBoot2;
} }