diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2016-04-26 21:18:46 -0700 |
---|---|---|
committer | John Ericson <Ericson2314@Yahoo.com> | 2016-10-27 21:47:46 -0700 |
commit | d9bc6eb7f01af72fb5e9c6d9fb0189684728fef7 (patch) | |
tree | 2739795889ceb30f860a0982108415ad24423f8b /pkgs/stdenv/default.nix | |
parent | ca2b03439f31dca0beee0d9b492dd18db78315cd (diff) | |
download | nixlib-d9bc6eb7f01af72fb5e9c6d9fb0189684728fef7.tar nixlib-d9bc6eb7f01af72fb5e9c6d9fb0189684728fef7.tar.gz nixlib-d9bc6eb7f01af72fb5e9c6d9fb0189684728fef7.tar.bz2 nixlib-d9bc6eb7f01af72fb5e9c6d9fb0189684728fef7.tar.lz nixlib-d9bc6eb7f01af72fb5e9c6d9fb0189684728fef7.tar.xz nixlib-d9bc6eb7f01af72fb5e9c6d9fb0189684728fef7.tar.zst nixlib-d9bc6eb7f01af72fb5e9c6d9fb0189684728fef7.zip |
top-level: Make `stdenv/default.nix` more concise with `inherit (expr) id;` syntax
Diffstat (limited to 'pkgs/stdenv/default.nix')
-rw-r--r-- | pkgs/stdenv/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 96f07ae9fc6f..3035d87e1fc5 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -16,9 +16,7 @@ rec { # i.e., the stuff in /bin, /usr/bin, etc. This environment should # be used with care, since many Nix packages will not build properly # with it (e.g., because they require GNU Make). - stdenvNative = (import ./native { - inherit system allPackages config; - }).stdenv; + inherit (import ./native { inherit system allPackages config; }) stdenvNative; stdenvNativePkgs = allPackages { bootStdenv = stdenvNative; @@ -33,12 +31,12 @@ rec { pkgs = stdenvNativePkgs; }; - stdenvFreeBSD = (import ./freebsd { inherit system allPackages platform config; }).stdenvFreeBSD; + inherit (import ./freebsd { inherit system allPackages platform config; }) stdenvFreeBSD; # 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'. stdenv = |