public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add diffutils.

Browse Source 
svn path=/nixpkgs/trunk/; revision=6795
This commit is contained in:
Eelco Dolstra 2006-10-20 22:23:36 +00:00
parent f5502aaba7
commit 0b85530440
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -7,7 +7,7 @@ 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" [ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep"
"gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf" "gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf"
]; ];
}; };
@ -17,7 +17,7 @@ let
builder = ./make-bootstrap-tools.sh; builder = ./make-bootstrap-tools.sh;
inherit (pkgsDiet) inherit (pkgsDiet)
coreutils findutils gnugrep gawk coreutils findutils diffutils gnugrep gawk
gnutar gzip bzip2 gnumake bash patch; 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;

4
pkgs/stdenv/linux/make-bootstrap-tools.sh
View File

@ -40,6 +40,7 @@ rm tools/bin/printf # idem
cp $findutils/bin/find tools/bin cp $findutils/bin/find tools/bin
cp $findutils/bin/xargs tools/bin cp $findutils/bin/xargs tools/bin
cp $diffutils/bin/* 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 cp $gawk/bin/gawk tools/bin
@ -51,6 +52,7 @@ cp $gnumake/bin/* tools/bin
cp $patch/bin/* tools/bin cp $patch/bin/* tools/bin
cp $patchelf/bin/* tools/bin cp $patchelf/bin/* tools/bin
nukeRefs tools/bin/diff
nukeRefs tools/bin/sed nukeRefs tools/bin/sed
nukeRefs tools/bin/gawk nukeRefs tools/bin/gawk
nukeRefs tools/bin/tar nukeRefs tools/bin/tar
@ -62,7 +64,7 @@ nukeRefs tools/bin/make
# Create the binutils tarball. # Create the binutils tarball.
mkdir binutils mkdir binutils
mkdir binutils/bin mkdir binutils/bin
for i in as ld ar ranlib nm strip; do for i in as ld ar ranlib nm strip readelf; do
cp $binutils/bin/$i binutils/bin cp $binutils/bin/$i binutils/bin
nukeRefs binutils/bin/$i nukeRefs binutils/bin/$i
done done