don't let gzip depend on gzip

svn path=/nixpkgs/trunk/; revision=1576

5 files changed, 4 insertions, 3 deletions

diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/builder.sh b/pkgs/stdenv/nix-linux-static/gzip-static/builder.sh
index 2e6e4b9e083f4..161c0ae664071 100644
--- a/pkgs/stdenv/nix-linux-static/gzip-static/builder.sh
+++ b/pkgs/stdenv/nix-linux-static/gzip-static/builder.sh
@@ -1,5 +1,5 @@
 . $stdenv/setup
  
-tar zxvf $src
 mkdir $out
-cp -a gzip-1.3.3/* $out
+cp -a $src1 $out
+cp -a $src2 $out
diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/default.nix b/pkgs/stdenv/nix-linux-static/gzip-static/default.nix
index d3e42e234089d..4890e75cab5e4 100644
--- a/pkgs/stdenv/nix-linux-static/gzip-static/default.nix
+++ b/pkgs/stdenv/nix-linux-static/gzip-static/default.nix
@@ -3,5 +3,6 @@
 stdenv.mkDerivation {
   name = "gzip-static-1.3.3";
   builder = ./builder.sh;
-  src = ./gzip-1.3.3-static.tar.gz;
+  src1 = ./gzip;
+  src2 = ./gunzip;
 }
diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/gunzip b/pkgs/stdenv/nix-linux-static/gzip-static/gunzip
new file mode 100755
index 0000000000000..c6059153306e3
--- /dev/null
+++ b/pkgs/stdenv/nix-linux-static/gzip-static/gunzip
Binary files differdiff --git a/pkgs/stdenv/nix-linux-static/gzip-static/gzip b/pkgs/stdenv/nix-linux-static/gzip-static/gzip
new file mode 100755
index 0000000000000..c6059153306e3
--- /dev/null
+++ b/pkgs/stdenv/nix-linux-static/gzip-static/gzip
Binary files differdiff --git a/pkgs/stdenv/nix-linux-static/gzip-static/gzip-1.3.3-static.tar.gz b/pkgs/stdenv/nix-linux-static/gzip-static/gzip-1.3.3-static.tar.gz
deleted file mode 100644
index 21452283bb153..0000000000000
--- a/pkgs/stdenv/nix-linux-static/gzip-static/gzip-1.3.3-static.tar.gz
+++ /dev/null
Binary files differ