* Nix: no longer need a builder, use an external bzip2, removed

  nix-unstable.

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

1 files changed, 9 insertions, 6 deletions

diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix
index 42d2ac8c2c0..8f91b7419eb 100644
--- a/pkgs/misc/nix/default.nix
+++ b/pkgs/misc/nix/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, aterm, bdb, perl, curl
+{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
-assert aterm != null && bdb != null && perl != null;
-
 stdenv.mkDerivation {
   name = "nix-0.10.1";
-  builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/nix/nix-0.10.1/nix-0.10.1.tar.bz2;
     md5 = "22dc0c024ca5bb477da0b38ba834dbf2";
   };
-  buildInputs = [aterm bdb perl curl];
-  inherit storeDir stateDir aterm bdb;
+  
+  buildInputs = [perl curl];
+
+  configureFlags = "
+    --with-store-dir=${storeDir} --localstatedir=${stateDir}
+    --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
+    --disable-init-state";
 }