diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-31 10:19:01 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-31 10:19:01 +0000 |
| commit | 0376334dde8ba130e6a53b308567a0838c6207c3 (patch) | |
| tree | 53156cc4074c91f59d4d589c92c39641c90f5b18 /pkgs | |
| parent | b3c93a41c1e44a533d4bd8ca287d0c3da1f4dc20 (diff) | |
* New Nix release.
svn path=/nixpkgs/trunk/; revision=886
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/nix/builder.sh | 13 | ||||
| -rw-r--r-- | pkgs/misc/nix/default.nix | 16 |
2 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/misc/nix/builder.sh b/pkgs/misc/nix/builder.sh index 24de39295273e..28e22f3bbf7db 100644 --- a/pkgs/misc/nix/builder.sh +++ b/pkgs/misc/nix/builder.sh @@ -1,10 +1,7 @@ -buildinputs="$aterm $bdb" . $stdenv/setup -tar xvfj $src -cd nix-* -./configure --prefix=$out \ - --with-store-dir=/nix/store --localstatedir=/nix/var \ - --with-aterm=$aterm --with-bdb=$bdb -make -make install +configureFlags="\ + --with-store-dir=/nix/store --localstatedir=/nix/var \ + --with-aterm=$aterm --with-bdb=$bdb" + +genericBuild diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix index 601ab0b6f019d..15ea7b6bfca54 100644 --- a/pkgs/misc/nix/default.nix +++ b/pkgs/misc/nix/default.nix @@ -1,15 +1,19 @@ -{stdenv, fetchurl, aterm, bdb}: +{ stdenv, fetchurl, aterm, bdb, perl +, storeDir ? "/nix/store" +, stateDir ? "/nix/var" +}: -assert aterm != null && bdb != null; +assert aterm != null && bdb != null && perl != null; # assert bdb.version >= 4.2 # assert aterm.version >= 2.0 stdenv.mkDerivation { - name = "nix-0.5pre807"; + name = "nix-0.5pre881"; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre807/nix-0.5pre807.tar.bz2; - md5 = "fa64bfc39de3e8903954328e4a90d530"; + url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre881/nix-0.5pre881.tar.bz2; + md5 = "427a4add7b374ea392ec81a3494cfb23"; }; - inherit aterm bdb; + buildInputs = [aterm bdb perl]; + inherit storeDir stateDir aterm bdb; } |