From 641101c7fda853b04d6ded6d046012fc3468bd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 28 Nov 2009 19:21:33 +0000
Subject: [PATCH] Again attempting to add gunzip to the bootstrap-tools to
 allow the ppq installation.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18690
---
 pkgs/stdenv/linux/scripts/unpack-bootstrap-tools-arm.sh | 8 +++++++-
 pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh     | 8 +++++++-
 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 8692983d985..2399e48b026 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 8692983d985..2399e48b026 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