* Regression fix.
svn path=/nixpkgs/trunk/; revision=587
This commit is contained in:
parent
480d68ece3
commit
fe1c5cb1e1
|
@ -1,6 +1,11 @@
|
||||||
{ stdenv, fetchurl, openssl, db4, expat, perl
|
{ stdenv, fetchurl, openssl, db4, expat, perl
|
||||||
, sslSupport, db4Support
|
, sslSupport, db4Support
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
assert sslSupport -> !isNull openssl;
|
||||||
|
assert db4Support -> !isNull db4;
|
||||||
|
assert !isNull expat && !isNull perl;
|
||||||
|
|
||||||
derivation {
|
derivation {
|
||||||
name = "apache-httpd-2.0.48";
|
name = "apache-httpd-2.0.48";
|
||||||
system = stdenv.system;
|
system = stdenv.system;
|
||||||
|
@ -11,6 +16,9 @@ derivation {
|
||||||
md5 = "466c63bb71b710d20a5c353df8c1a19c";
|
md5 = "466c63bb71b710d20a5c353df8c1a19c";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sslSupport = sslSupport;
|
||||||
|
db4Support = db4Support;
|
||||||
|
|
||||||
stdenv = stdenv;
|
stdenv = stdenv;
|
||||||
perl = perl;
|
perl = perl;
|
||||||
openssl = if sslSupport then openssl else "";
|
openssl = if sslSupport then openssl else "";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user