diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-19 22:47:51 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-19 22:47:51 +0000 |
| commit | 884e8571c34e5544330ffa55f1c5ca5a9fe3d05e (patch) | |
| tree | 07fb6917e6c7803d9a767809a55aad0e34260dde /pkgs/stdenv/linux | |
| parent | 1acd2157cc15f1e0a7cb8c9a79032f5e1ce7a0ea (diff) | |
| download | nixpkgs-884e8571c34e5544330ffa55f1c5ca5a9fe3d05e.tar nixpkgs-884e8571c34e5544330ffa55f1c5ca5a9fe3d05e.tar.gz nixpkgs-884e8571c34e5544330ffa55f1c5ca5a9fe3d05e.tar.bz2 nixpkgs-884e8571c34e5544330ffa55f1c5ca5a9fe3d05e.tar.lz nixpkgs-884e8571c34e5544330ffa55f1c5ca5a9fe3d05e.tar.xz nixpkgs-884e8571c34e5544330ffa55f1c5ca5a9fe3d05e.tar.zst nixpkgs-884e8571c34e5544330ffa55f1c5ca5a9fe3d05e.zip | |
* Add grep.
svn path=/nixpkgs/trunk/; revision=6783
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 25fe39adb49..1c71f9defaf 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -7,13 +7,13 @@ let # stdenv-linux's dependencies, rather than building new ones with # dietlibc. bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv) - ["coreutils" "gnused" "gnutar" "bzip2" "bash" "patch" "patchelf"]; + ["coreutils" "gnused" "gnutar" "gnugrep" "bzip2" "bash" "patch" "patchelf"]; }; generator = pkgs.stdenv.mkDerivation { name = "bootstrap-tools-generator"; builder = ./make-bootstrap-tools.sh; - inherit (pkgsDiet) coreutils gnused gnutar bzip2 bash patch; + inherit (pkgsDiet) coreutils gnused gnugrep gnutar bzip2 bash patch; curl = pkgsDiet.realCurl; # The result should not contain any references (store paths) so diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.sh b/pkgs/stdenv/linux/make-bootstrap-tools.sh index 3d3878ac505..fee37373c92 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/make-bootstrap-tools.sh @@ -35,12 +35,14 @@ rm tools/bin/groups # has references rm tools/bin/printf # idem cp $gnused/bin/* tools/bin +cp $gnugrep/bin/* tools/bin cp $gnutar/bin/* tools/bin cp $bzip2/bin/bunzip2 tools/bin cp $patch/bin/* tools/bin nukeRefs tools/bin/sed nukeRefs tools/bin/tar +nukeRefs tools/bin/grep #cp $patchelf/bin/* tools/bin @@ -48,7 +50,7 @@ nukeRefs tools/bin/tar for i in $out/in-nixpkgs/* tools/bin/*; do if test -x $i; then chmod +w $i - strip -s $i + strip -s $i || true fi done |