* Add gawk.
svn path=/nixpkgs/trunk/; revision=6794
This commit is contained in:
parent
207bba1367
commit
f5502aaba7
@ -7,14 +7,18 @@ let
|
|||||||
# stdenv-linux's dependencies, rather than building new ones with
|
# stdenv-linux's dependencies, rather than building new ones with
|
||||||
# dietlibc.
|
# dietlibc.
|
||||||
bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv)
|
bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv)
|
||||||
["binutils" "gcc" "coreutils" "findutils" "gnused" "gnugrep" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf"];
|
[ "binutils" "gcc" "coreutils" "findutils" "gnused" "gnugrep"
|
||||||
|
"gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
generator = pkgs.stdenv.mkDerivation {
|
generator = pkgs.stdenv.mkDerivation {
|
||||||
name = "bootstrap-tools-generator";
|
name = "bootstrap-tools-generator";
|
||||||
builder = ./make-bootstrap-tools.sh;
|
builder = ./make-bootstrap-tools.sh;
|
||||||
|
|
||||||
inherit (pkgsDiet) coreutils findutils gnugrep gnutar gzip bzip2 gnumake bash patch;
|
inherit (pkgsDiet)
|
||||||
|
coreutils findutils gnugrep gawk
|
||||||
|
gnutar gzip bzip2 gnumake bash patch;
|
||||||
gnused = pkgsDiet.gnused412; # 4.1.5 gives "Memory exhausted" errors
|
gnused = pkgsDiet.gnused412; # 4.1.5 gives "Memory exhausted" errors
|
||||||
binutils = pkgsDiet.binutils;
|
binutils = pkgsDiet.binutils;
|
||||||
|
|
||||||
|
@ -42,6 +42,8 @@ cp $findutils/bin/find tools/bin
|
|||||||
cp $findutils/bin/xargs tools/bin
|
cp $findutils/bin/xargs tools/bin
|
||||||
cp $gnused/bin/* tools/bin
|
cp $gnused/bin/* tools/bin
|
||||||
cp $gnugrep/bin/* tools/bin
|
cp $gnugrep/bin/* tools/bin
|
||||||
|
cp $gawk/bin/gawk tools/bin
|
||||||
|
ln -s gawk tools/bin/awk
|
||||||
cp $gnutar/bin/* tools/bin
|
cp $gnutar/bin/* tools/bin
|
||||||
cp $gunzip/bin/gunzip tools/bin
|
cp $gunzip/bin/gunzip tools/bin
|
||||||
cp $bzip2/bin/bunzip2 tools/bin
|
cp $bzip2/bin/bunzip2 tools/bin
|
||||||
@ -50,6 +52,7 @@ cp $patch/bin/* tools/bin
|
|||||||
cp $patchelf/bin/* tools/bin
|
cp $patchelf/bin/* tools/bin
|
||||||
|
|
||||||
nukeRefs tools/bin/sed
|
nukeRefs tools/bin/sed
|
||||||
|
nukeRefs tools/bin/gawk
|
||||||
nukeRefs tools/bin/tar
|
nukeRefs tools/bin/tar
|
||||||
nukeRefs tools/bin/grep
|
nukeRefs tools/bin/grep
|
||||||
nukeRefs tools/bin/patchelf
|
nukeRefs tools/bin/patchelf
|
||||||
|
Loading…
x
Reference in New Issue
Block a user