diff --git a/pkgs/servers/sql/postgresql/builder.sh b/pkgs/servers/sql/postgresql/builder.sh index 0ecefd3a5453..26144d2d02a5 100755 --- a/pkgs/servers/sql/postgresql/builder.sh +++ b/pkgs/servers/sql/postgresql/builder.sh @@ -2,9 +2,9 @@ export LANG=en_US -configureFlags="" -if test "$jdbcSupport"; then - configureFlags="--with-java $configureFlags" -fi +# configureFlags="" +# if test "$jdbcSupport"; then +# configureFlags="--with-java $configureFlags" +# fi genericBuild diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index acb0b1d41a36..ac0b2d601d91 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,9 +1,8 @@ -{stdenv, fetchurl, zlib, ncurses, readline, jdbcSupport ? true, ant ? null}: +{stdenv, fetchurl, zlib, ncurses, readline}: assert zlib != null; assert ncurses != null; assert readline != null; -assert jdbcSupport -> ant != null; stdenv.mkDerivation { name = "postgresql-8.0.3"; @@ -14,9 +13,6 @@ stdenv.mkDerivation { md5 = "c0914a133ce6c1e0f1d8b93982d6e881"; }; - inherit readline jdbcSupport; - ant = if jdbcSupport then ant else null; - - buildInputs = - [zlib ncurses readline (if jdbcSupport then [ant] else [])]; + inherit readline; + buildInputs = [zlib ncurses readline]; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 599b4b26edba..f02fdc23728b 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -958,8 +958,6 @@ rec { postgresql = (import ../servers/sql/postgresql) { inherit fetchurl stdenv readline ncurses zlib; - jdbcSupport = true; - ant = apacheAntBlackdown14; }; mysql = import ../servers/sql/mysql {