From a0909d11c6970a87ee47a8e51457da6a587b098d Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 19 Oct 2004 14:48:16 +0000
Subject: [PATCH] move gzip and gunzip in a seperate directory to avoid having
 the hash encoded in the binary name

svn path=/nixpkgs/trunk/; revision=1580
---
 .../nix-linux-static/gzip-static/{ => bin}/gunzip   | Bin
 .../nix-linux-static/gzip-static/{ => bin}/gzip     | Bin
 pkgs/stdenv/nix-linux-static/gzip-static/builder.sh |   4 ++--
 .../stdenv/nix-linux-static/gzip-static/default.nix |   2 --
 4 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/stdenv/nix-linux-static/gzip-static/{ => bin}/gunzip (100%)
 rename pkgs/stdenv/nix-linux-static/gzip-static/{ => bin}/gzip (100%)

diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/gunzip b/pkgs/stdenv/nix-linux-static/gzip-static/bin/gunzip
similarity index 100%
rename from pkgs/stdenv/nix-linux-static/gzip-static/gunzip
rename to pkgs/stdenv/nix-linux-static/gzip-static/bin/gunzip
diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/gzip b/pkgs/stdenv/nix-linux-static/gzip-static/bin/gzip
similarity index 100%
rename from pkgs/stdenv/nix-linux-static/gzip-static/gzip
rename to pkgs/stdenv/nix-linux-static/gzip-static/bin/gzip
diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/builder.sh b/pkgs/stdenv/nix-linux-static/gzip-static/builder.sh
index 161c0ae66407..92da0c475caa 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
  
 mkdir $out
-cp -a $src1 $out
-cp -a $src2 $out
+cp -a gzip $out/bin
+cp -a gunzip $out/bin
diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/default.nix b/pkgs/stdenv/nix-linux-static/gzip-static/default.nix
index 4890e75cab5e..42c23306b0e3 100644
--- a/pkgs/stdenv/nix-linux-static/gzip-static/default.nix
+++ b/pkgs/stdenv/nix-linux-static/gzip-static/default.nix
@@ -3,6 +3,4 @@
 stdenv.mkDerivation {
   name = "gzip-static-1.3.3";
   builder = ./builder.sh;
-  src1 = ./gzip;
-  src2 = ./gunzip;
 }