forked from mirrors/nixpkgs
PostgreSQL requires zlib and ncurses
svn path=/nixpkgs/trunk/; revision=1328
This commit is contained in:
parent
007765937b
commit
5863d4fc98
|
@ -1,5 +1,8 @@
|
|||
{stdenv, fetchurl, readline, jdbcSupport ? true, ant ? null}:
|
||||
{stdenv, fetchurl, zlib, ncurses, readline, jdbcSupport ? true, ant ? null}:
|
||||
|
||||
assert zlib != null;
|
||||
assert ncurses != null;
|
||||
assert readline != null;
|
||||
assert jdbcSupport -> ant != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
@ -11,8 +14,9 @@ stdenv.mkDerivation {
|
|||
md5 = "97e750c8e69c208b75b6efedc5a36efb";
|
||||
};
|
||||
|
||||
inherit jdbcSupport;
|
||||
inherit readline jdbcSupport;
|
||||
ant = if jdbcSupport then ant else null;
|
||||
|
||||
buildInputs = if jdbcSupport then [ant] else [];
|
||||
buildInputs =
|
||||
[zlib ncurses readline (if jdbcSupport then [ant] else [])];
|
||||
}
|
||||
|
|
|
@ -632,7 +632,7 @@ rec {
|
|||
};
|
||||
|
||||
postgresql = (import ../servers/sql/postgresql) {
|
||||
inherit fetchurl stdenv readline;
|
||||
inherit fetchurl stdenv readline ncurses zlib;
|
||||
jdbcSupport = true;
|
||||
ant = apacheAntBlackdown14;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue