diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-07-14 08:35:59 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-07-14 08:35:59 +0000 |
| commit | b2f6e204a28fe55677887a4aeb0c3707bad36b45 (patch) | |
| tree | 777ccc40d27542a7f7de667d05255c5ab6ff6b19 | |
| parent | 452c3350d851278a294572b66c56a3614544d2f7 (diff) | |
| download | nixpkgs-b2f6e204a28fe55677887a4aeb0c3707bad36b45.tar nixpkgs-b2f6e204a28fe55677887a4aeb0c3707bad36b45.tar.gz nixpkgs-b2f6e204a28fe55677887a4aeb0c3707bad36b45.tar.bz2 nixpkgs-b2f6e204a28fe55677887a4aeb0c3707bad36b45.tar.lz nixpkgs-b2f6e204a28fe55677887a4aeb0c3707bad36b45.tar.xz nixpkgs-b2f6e204a28fe55677887a4aeb0c3707bad36b45.tar.zst nixpkgs-b2f6e204a28fe55677887a4aeb0c3707bad36b45.zip | |
* Remove redundant files, move path.nix around a bit.
svn path=/nixpkgs/trunk/; revision=5701
| -rw-r--r-- | pkgs/stdenv/common-path.nix (renamed from pkgs/stdenv/nix/path.nix) | 0 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/path.nix | 13 | ||||
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 2 |
4 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/stdenv/nix/path.nix b/pkgs/stdenv/common-path.nix index 0ad0d83255b..0ad0d83255b 100644 --- a/pkgs/stdenv/nix/path.nix +++ b/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; |