* Use separate Berkeley DB and ATerm.
svn path=/nixpkgs/trunk/; revision=793
This commit is contained in:
parent
d113da8bab
commit
5eea59c2cd
@ -1,10 +1,12 @@
|
|||||||
#! /bin/sh -e
|
#! /bin/sh -e
|
||||||
|
|
||||||
|
buildinputs="$aterm $bdb"
|
||||||
. $stdenv/setup
|
. $stdenv/setup
|
||||||
|
|
||||||
tar xvfj $src
|
tar xvfj $src
|
||||||
cd nix-*
|
cd nix-*
|
||||||
./configure --prefix=$out \
|
./configure --prefix=$out \
|
||||||
--with-store-dir=/nix/store --localstatedir=/nix/var
|
--with-store-dir=/nix/store --localstatedir=/nix/var \
|
||||||
|
--with-aterm=$aterm --with-bdb=$bdb
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
|
@ -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 {
|
derivation {
|
||||||
name = "nix-0.5pre789";
|
name = "nix-0.5pre792";
|
||||||
system = stdenv.system;
|
system = stdenv.system;
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre789/nix-0.5pre789.tar.bz2;
|
url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre792/nix-0.5pre792.tar.bz2;
|
||||||
md5 = "1c5c1cd6e8bf9b68cc9df3b70017ce15";
|
md5 = "8f8747478eac5b2df5791400af506cf0";
|
||||||
};
|
};
|
||||||
inherit stdenv;
|
inherit stdenv aterm bdb;
|
||||||
}
|
}
|
||||||
|
@ -662,7 +662,9 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
nix = (import ../misc/nix) {
|
nix = (import ../misc/nix) {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv aterm;
|
||||||
|
aterm = aterm_2_0_5;
|
||||||
|
bdb = db4;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user