top-level: Make `stdenv/default.nix` more concise with `inherit (expr) id;` syntax

2 files changed, 5 insertions, 7 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 =
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 291ef5a5079f..fcd0805275be 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -141,5 +141,5 @@ rec {
   };
 
 
-  stdenv = stdenvBoot2;
+  stdenvNative = stdenvBoot2;
 }