public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PostgreSQL requires zlib and ncurses

Browse Source 
svn path=/nixpkgs/trunk/; revision=1328
This commit is contained in:
Martin Bravenboer 2004-08-24 12:02:07 +00:00
parent 007765937b
commit 5863d4fc98
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/sql/postgresql/default.nix
View File

@ -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; assert jdbcSupport -> ant != null;
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,8 +14,9 @@ stdenv.mkDerivation {
md5 = "97e750c8e69c208b75b6efedc5a36efb"; md5 = "97e750c8e69c208b75b6efedc5a36efb";
}; };
inherit jdbcSupport; inherit readline jdbcSupport;
ant = if jdbcSupport then ant else null; ant = if jdbcSupport then ant else null;
buildInputs = if jdbcSupport then [ant] else []; buildInputs =
[zlib ncurses readline (if jdbcSupport then [ant] else [])];
} }

2
pkgs/system/all-packages-generic.nix
View File

@ -632,7 +632,7 @@ rec {
}; };
postgresql = (import ../servers/sql/postgresql) { postgresql = (import ../servers/sql/postgresql) {
inherit fetchurl stdenv readline; inherit fetchurl stdenv readline ncurses zlib;
jdbcSupport = true; jdbcSupport = true;
ant = apacheAntBlackdown14; ant = apacheAntBlackdown14;
}; };