* Latest unstable Nix. Add OpenSSL as a dependency.
svn path=/nixpkgs/trunk/; revision=8137
This commit is contained in:
parent
5dde0fead7
commit
56e0e2fbea
|
@ -1,17 +1,17 @@
|
||||||
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2
|
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
|
||||||
, storeDir ? "/nix/store"
|
, storeDir ? "/nix/store"
|
||||||
, stateDir ? "/nix/var"
|
, stateDir ? "/nix/var"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "nix-0.11pre8085";
|
name = "nix-0.11pre8133";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://nix.cs.uu.nl/dist/nix/nix-0.11pre8085/nix-0.11pre8085.tar.bz2;
|
url = http://nix.cs.uu.nl/dist/nix/nix-0.11pre8133/nix-0.11pre8133.tar.bz2;
|
||||||
md5 = "5690869fc2d3ef70a221b42282315980";
|
md5 = "33c28fcd97d5ae64e9219897b36cc6e4)";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [perl curl];
|
buildInputs = [perl curl openssl];
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
||||||
|
|
|
@ -3102,7 +3102,7 @@ rec {
|
||||||
|
|
||||||
# The bleeding edge.
|
# The bleeding edge.
|
||||||
nixUnstable = import ../misc/nix/unstable.nix {
|
nixUnstable = import ../misc/nix/unstable.nix {
|
||||||
inherit fetchurl stdenv perl curl bzip2;
|
inherit fetchurl stdenv perl curl bzip2 openssl;
|
||||||
aterm = aterm242fixes;
|
aterm = aterm242fixes;
|
||||||
db4 = db45;
|
db4 = db45;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue