diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-19 22:31:08 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-19 22:31:08 +0000 |
| commit | 1acd2157cc15f1e0a7cb8c9a79032f5e1ce7a0ea (patch) | |
| tree | 2e7fbb7ea9d75a3b8643d18914f93c2de83502ec /pkgs/stdenv/linux | |
| parent | 8ae026392bc54411d57951e1ba73f04a0dc0acb7 (diff) | |
| download | nixpkgs-1acd2157cc15f1e0a7cb8c9a79032f5e1ce7a0ea.tar nixpkgs-1acd2157cc15f1e0a7cb8c9a79032f5e1ce7a0ea.tar.gz nixpkgs-1acd2157cc15f1e0a7cb8c9a79032f5e1ce7a0ea.tar.bz2 nixpkgs-1acd2157cc15f1e0a7cb8c9a79032f5e1ce7a0ea.tar.lz nixpkgs-1acd2157cc15f1e0a7cb8c9a79032f5e1ce7a0ea.tar.xz nixpkgs-1acd2157cc15f1e0a7cb8c9a79032f5e1ce7a0ea.tar.zst nixpkgs-1acd2157cc15f1e0a7cb8c9a79032f5e1ce7a0ea.zip | |
* Add patch, sed.
svn path=/nixpkgs/trunk/; revision=6782
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 | 25 |
2 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index df09226183e..25fe39adb49 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) - ["bash" "bzip2" "coreutils" "gnutar" "patchelf"]; + ["coreutils" "gnused" "gnutar" "bzip2" "bash" "patch" "patchelf"]; }; generator = pkgs.stdenv.mkDerivation { name = "bootstrap-tools-generator"; builder = ./make-bootstrap-tools.sh; - inherit (pkgsDiet) bash bzip2 coreutils gnutar; + inherit (pkgsDiet) coreutils gnused 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 e7f170f49a8..3d3878ac505 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/make-bootstrap-tools.sh @@ -26,13 +26,6 @@ bzip2 < $curl/bin/curl > $out/in-nixpkgs/curl.bz2 nukeRefs $out/in-nixpkgs/bash nukeRefs $out/in-nixpkgs/tar -for i in $out/in-nixpkgs/*; do - if test -x $i; then - chmod +w $i - strip -s $i - fi -done - mkdir tools mkdir tools/bin @@ -41,7 +34,25 @@ cp $coreutils/bin/* tools/bin rm tools/bin/groups # has references rm tools/bin/printf # idem +cp $gnused/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 + #cp $patchelf/bin/* tools/bin + + +for i in $out/in-nixpkgs/* tools/bin/*; do + if test -x $i; then + chmod +w $i + strip -s $i + fi +done + + tar cvfj $out/on-server/static-tools.tar.bz2 tools |