summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-28 19:21:33 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-28 19:21:33 +0000
commit641101c7fda853b04d6ded6d046012fc3468bd14 (patch)
tree741198be37ee9242678ca11d8605e5efd3c6a463 /pkgs/stdenv
parent5c0bb27a8681b828affd5c2c8bd0ac6ee04f0cd7 (diff)
downloadnixlib-641101c7fda853b04d6ded6d046012fc3468bd14.tar
nixlib-641101c7fda853b04d6ded6d046012fc3468bd14.tar.gz
nixlib-641101c7fda853b04d6ded6d046012fc3468bd14.tar.bz2
nixlib-641101c7fda853b04d6ded6d046012fc3468bd14.tar.lz
nixlib-641101c7fda853b04d6ded6d046012fc3468bd14.tar.xz
nixlib-641101c7fda853b04d6ded6d046012fc3468bd14.tar.zst
nixlib-641101c7fda853b04d6ded6d046012fc3468bd14.zip
Again attempting to add gunzip to the bootstrap-tools to allow the ppq
installation.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18690
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh8
-rw-r--r--pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh8
2 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
index 8692983d9859..2399e48b026f 100644
--- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
+++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh
@@ -41,7 +41,13 @@ mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so
 # Provide some additional symlinks.
 ln -s bash $out/bin/sh
 ln -s bzip2 $out/bin/bunzip2
-ln -s gzip $out/bin/gunzip
+
+# Mimic the gunzip script as in gzip installations
+cat > $out/bin/gunzip <<EOF
+#!$out/bin/sh
+exec $out/bin/gzip -d "\$@"
+EOF
+chmod +x $out/bin/gunzip
 
 # fetchurl needs curl.
 bzip2 -d < $curl > $out/bin/curl
diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
index 8692983d9859..2399e48b026f 100644
--- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
+++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh
@@ -41,7 +41,13 @@ mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so
 # Provide some additional symlinks.
 ln -s bash $out/bin/sh
 ln -s bzip2 $out/bin/bunzip2
-ln -s gzip $out/bin/gunzip
+
+# Mimic the gunzip script as in gzip installations
+cat > $out/bin/gunzip <<EOF
+#!$out/bin/sh
+exec $out/bin/gzip -d "\$@"
+EOF
+chmod +x $out/bin/gunzip
 
 # fetchurl needs curl.
 bzip2 -d < $curl > $out/bin/curl