* Remove redundant files, move path.nix around a bit.
svn path=/nixpkgs/trunk/; revision=5701
This commit is contained in:
parent
452c3350d8
commit
b2f6e204a2
@ -200,7 +200,7 @@ rec {
|
|||||||
name = "stdenv-linux";
|
name = "stdenv-linux";
|
||||||
preHook = ./prehook.sh;
|
preHook = ./prehook.sh;
|
||||||
initialPath = [
|
initialPath = [
|
||||||
((import ../nix/path.nix) {pkgs = stdenvLinuxBoot3Pkgs;})
|
((import ../common-path.nix) {pkgs = stdenvLinuxBoot3Pkgs;})
|
||||||
stdenvLinuxBoot3Pkgs.patchelf
|
stdenvLinuxBoot3Pkgs.patchelf
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -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
|
|
||||||
]
|
|
@ -3,7 +3,7 @@
|
|||||||
genericStdenv {
|
genericStdenv {
|
||||||
name = "stdenv-nix";
|
name = "stdenv-nix";
|
||||||
preHook = ./prehook.sh;
|
preHook = ./prehook.sh;
|
||||||
initialPath = (import ./path.nix) {pkgs = pkgs;};
|
initialPath = (import ../common-path.nix) {pkgs = pkgs;};
|
||||||
|
|
||||||
inherit stdenv;
|
inherit stdenv;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user