diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-02-16 16:54:01 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-02-16 16:54:01 +0000 |
| commit | 5eea59c2cd42f2ec1e7cc621bd900a00ec59e090 (patch) | |
| tree | 847e1a1c9d5721b806b77be37062298689e6cea7 | |
| parent | d113da8babd02f5d09bb9ee5e111509f50bceb2e (diff) | |
* Use separate Berkeley DB and ATerm.
svn path=/nixpkgs/trunk/; revision=793
| -rwxr-xr-x | pkgs/misc/nix/builder.sh | 14 | ||||
| -rw-r--r-- | pkgs/misc/nix/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 4 |
3 files changed, 20 insertions, 12 deletions
diff --git a/pkgs/misc/nix/builder.sh b/pkgs/misc/nix/builder.sh index aafa61da2caf8..6e868d94bbd89 100755 --- a/pkgs/misc/nix/builder.sh +++ b/pkgs/misc/nix/builder.sh @@ -1,10 +1,12 @@ #! /bin/sh -e -. $stdenv/setup +buildinputs="$aterm $bdb" +. $stdenv/setup -tar xvfj $src -cd nix-* +tar xvfj $src +cd nix-* ./configure --prefix=$out \ - --with-store-dir=/nix/store --localstatedir=/nix/var -make -make install + --with-store-dir=/nix/store --localstatedir=/nix/var \ + --with-aterm=$aterm --with-bdb=$bdb +make +make install diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix index 2dff0ae6e3657..de54567da21df 100644 --- a/pkgs/misc/nix/default.nix +++ b/pkgs/misc/nix/default.nix @@ -1,12 +1,16 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, aterm, bdb}: + +assert aterm != null && bdb != null; +# assert bdb.version >= 4.2 +# assert aterm.version >= 2.0 derivation { - name = "nix-0.5pre789"; + name = "nix-0.5pre792"; system = stdenv.system; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre789/nix-0.5pre789.tar.bz2; - md5 = "1c5c1cd6e8bf9b68cc9df3b70017ce15"; + url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre792/nix-0.5pre792.tar.bz2; + md5 = "8f8747478eac5b2df5791400af506cf0"; }; - inherit stdenv; + inherit stdenv aterm bdb; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index beb669b6f0824..d11881d340c8b 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -662,7 +662,9 @@ }; nix = (import ../misc/nix) { - inherit fetchurl stdenv; + inherit fetchurl stdenv aterm; + aterm = aterm_2_0_5; + bdb = db4; }; } |