From b2f6e204a28fe55677887a4aeb0c3707bad36b45 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Jul 2006 08:35:59 +0000
Subject: [PATCH] * Remove redundant files, move path.nix around a bit.

svn path=/nixpkgs/trunk/; revision=5701
---
 pkgs/stdenv/{nix/path.nix => common-path.nix} |  0
 pkgs/stdenv/linux/default.nix                 |  2 +-
 pkgs/stdenv/linux/path.nix                    | 13 -------------
 pkgs/stdenv/nix/default.nix                   |  2 +-
 4 files changed, 2 insertions(+), 15 deletions(-)
 rename pkgs/stdenv/{nix/path.nix => common-path.nix} (100%)
 delete mode 100644 pkgs/stdenv/linux/path.nix

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 faa39a9802f0..9e4a1b4d4d33 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 01b23f950976..000000000000
--- 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 6805b45e049b..6bcc366a51df 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;