diff options
Diffstat (limited to 'pkgs/stdenv/nix-linux/default.nix')
-rw-r--r-- | pkgs/stdenv/nix-linux/default.nix | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/pkgs/stdenv/nix-linux/default.nix b/pkgs/stdenv/nix-linux/default.nix index 9e9602d5e1f6..9b4231962c30 100644 --- a/pkgs/stdenv/nix-linux/default.nix +++ b/pkgs/stdenv/nix-linux/default.nix @@ -1,36 +1,21 @@ {stdenv, glibc, pkgs, genericStdenv, gccWrapper}: -let { +genericStdenv { + name = "stdenv-nix-linux"; + preHook = ./prehook.sh; + initialPath = (import ../nix/path.nix) {pkgs = pkgs;}; - body = + inherit stdenv; - genericStdenv { - name = "stdenv-nix-linux"; - preHook = ./prehook.sh; - initialPath = (import ../nix/path.nix) {pkgs = pkgs;}; + gcc = gccWrapper { + name = pkgs.gcc.name; + nativeTools = false; + nativeGlibc = false; + inherit (pkgs) gcc binutils; + inherit glibc; + }; - inherit stdenv; - - gcc = gccWrapper { - name = pkgs.gcc.name; - nativeTools = false; - nativeGlibc = false; - inherit (pkgs) gcc binutils; - inherit stdenv glibc; - }; - - param1 = pkgs.bash; - } - - # Add a utility function to produce derivations that use this - # stdenv and its the bash shell. - // { - mkDerivation = attrs: derivation (attrs // { - builder = pkgs.bash ~ /bin/sh; - args = ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)]; - stdenv = body; - system = body.system; - }); - }; + bash = pkgs.bash ~ /bin/sh; + param1 = pkgs.bash; } |