don't make bzip2 an initial package, but download it instead. After all, we've got gzip :)

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

3 files changed, 9 insertions, 4 deletions

diff --git a/pkgs/stdenv/nix-linux-static/bzip2-static/builder.sh b/pkgs/stdenv/nix-linux-static/bzip2-static/builder.sh
index a65b64ef2754b..1bdc263489690 100644
--- a/pkgs/stdenv/nix-linux-static/bzip2-static/builder.sh
+++ b/pkgs/stdenv/nix-linux-static/bzip2-static/builder.sh
@@ -1,5 +1,8 @@
 . $stdenv/setup
- 
-tar zxvf $src
+
+PATH=$gzip:$PATH
+
+$curl/bin/curl $src > $tarball
+$tar/bin/tar zxvf $tarball
 mkdir $out
 cp -a bzip2-1.0.2/* $out
diff --git a/pkgs/stdenv/nix-linux-static/bzip2-static/bzip2-1.0.2-static.tar.gz b/pkgs/stdenv/nix-linux-static/bzip2-static/bzip2-1.0.2-static.tar.gz
deleted file mode 100644
index c79ebc9b04712..0000000000000
--- a/pkgs/stdenv/nix-linux-static/bzip2-static/bzip2-1.0.2-static.tar.gz
+++ /dev/null
Binary files differdiff --git a/pkgs/stdenv/nix-linux-static/bzip2-static/default.nix b/pkgs/stdenv/nix-linux-static/bzip2-static/default.nix
index 24b717d17a1cc..e6c6fe6e32043 100644
--- a/pkgs/stdenv/nix-linux-static/bzip2-static/default.nix
+++ b/pkgs/stdenv/nix-linux-static/bzip2-static/default.nix
@@ -1,7 +1,9 @@
-{stdenv}:
+{stdenv, gnutar, gzip, curl}:
  
 stdenv.mkDerivation {
+  inherit gnutar gzip curl;
   name = "bzip2-static-1.0.2";
   builder = ./builder.sh;
-  src = ./bzip2-1.0.2-static.tar.gz;
+  src = http://losser.st-lab.cs.uu.nl/~armijn/.nix/bzip2-1.0.2-static.tar.gz;
+  tarball = bzip2-1.0.2-static.tar.gz;
 }