From d9bc6eb7f01af72fb5e9c6d9fb0189684728fef7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 26 Apr 2016 21:18:46 -0700 Subject: top-level: Make `stdenv/default.nix` more concise with `inherit (expr) id;` syntax --- pkgs/stdenv/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'pkgs/stdenv/default.nix') 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 = -- cgit 1.4.1