diff options
Diffstat (limited to 'pkgs/stdenv/nix-linux')
-rw-r--r-- | pkgs/stdenv/nix-linux/boot.nix | 13 | ||||
-rw-r--r-- | pkgs/stdenv/nix-linux/default.nix | 8 | ||||
-rw-r--r-- | pkgs/stdenv/nix-linux/prehook-boot.sh | 4 |
3 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/stdenv/nix-linux/boot.nix b/pkgs/stdenv/nix-linux/boot.nix index cc5ab2122e871..b104add43184c 100644 --- a/pkgs/stdenv/nix-linux/boot.nix +++ b/pkgs/stdenv/nix-linux/boot.nix @@ -1,16 +1,19 @@ -{stdenv, glibc}: +{stdenv, pkgs, glibc}: (import ../generic) { name = "stdenv-nix-linux-boot"; preHook = ./prehook-boot.sh; - initialPath = "/usr/local /usr /"; + initialPath = (import ../nix/path.nix) {pkgs = pkgs;}; inherit stdenv; gcc = (import ../../build-support/gcc-wrapper) { - name = "gcc-native"; - isNative = true; - nativePrefix = "/usr"; + name = pkgs.gcc.name; + nativeTools = false; + nativeGlibc = false; + inherit (pkgs) gcc binutils; inherit stdenv glibc; }; + + param1 = pkgs.bash; } diff --git a/pkgs/stdenv/nix-linux/default.nix b/pkgs/stdenv/nix-linux/default.nix index 518939757488c..ecbbc488cb4d4 100644 --- a/pkgs/stdenv/nix-linux/default.nix +++ b/pkgs/stdenv/nix-linux/default.nix @@ -8,10 +8,10 @@ inherit stdenv; gcc = (import ../../build-support/gcc-wrapper) { - name = "gcc-native"; - isNative = false; - gcc = pkgs.gcc; - binutils = pkgs.binutils; + name = pkgs.gcc.name; + nativeTools = false; + nativeGlibc = false; + inherit (pkgs) gcc binutils; inherit stdenv glibc; }; diff --git a/pkgs/stdenv/nix-linux/prehook-boot.sh b/pkgs/stdenv/nix-linux/prehook-boot.sh index af1ba16ccbeb6..33f8bc0bb6e3a 100644 --- a/pkgs/stdenv/nix-linux/prehook-boot.sh +++ b/pkgs/stdenv/nix-linux/prehook-boot.sh @@ -1 +1,3 @@ -export SHELL=/bin/sh +export SHELL=$param1 + +export NIX_ENFORCE_PURITY= |