diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 550cd4739197..044eb9aef3f6 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -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 [])]; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 0fb4e26ab0d1..afc29caef4d9 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -632,7 +632,7 @@ rec { }; postgresql = (import ../servers/sql/postgresql) { - inherit fetchurl stdenv readline; + inherit fetchurl stdenv readline ncurses zlib; jdbcSupport = true; ant = apacheAntBlackdown14; };