diff --git a/pkgs/stdenv/nix/path.nix b/pkgs/stdenv/common-path.nix similarity index 100% rename from pkgs/stdenv/nix/path.nix rename to pkgs/stdenv/common-path.nix diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index faa39a9802f..9e4a1b4d4d3 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -200,7 +200,7 @@ rec { name = "stdenv-linux"; preHook = ./prehook.sh; initialPath = [ - ((import ../nix/path.nix) {pkgs = stdenvLinuxBoot3Pkgs;}) + ((import ../common-path.nix) {pkgs = stdenvLinuxBoot3Pkgs;}) stdenvLinuxBoot3Pkgs.patchelf ]; diff --git a/pkgs/stdenv/linux/path.nix b/pkgs/stdenv/linux/path.nix deleted file mode 100644 index 01b23f95097..00000000000 --- a/pkgs/stdenv/linux/path.nix +++ /dev/null @@ -1,13 +0,0 @@ -{pkgs}: [ - pkgs.coreutils - pkgs.findutils - pkgs.diffutils - pkgs.gnused - pkgs.gnugrep - pkgs.gawk - pkgs.gnutar - pkgs.gzip - pkgs.bzip2 - pkgs.gnumake - pkgs.bash -] diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 6805b45e049..6bcc366a51d 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -3,7 +3,7 @@ genericStdenv { name = "stdenv-nix"; preHook = ./prehook.sh; - initialPath = (import ./path.nix) {pkgs = pkgs;}; + initialPath = (import ../common-path.nix) {pkgs = pkgs;}; inherit stdenv;