diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-05-24 15:09:04 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-05-24 15:09:04 +0000 |
| commit | c76a931faa43b6e989de32f96b56fcce37c28186 (patch) | |
| tree | 3a0c4c4fce1a128fbc6201bf8069323dcac7c2d6 /pkgs/servers/sql | |
| parent | e3a47a07edb585f09390450c5142643277357524 (diff) | |
| download | nixpkgs-c76a931faa43b6e989de32f96b56fcce37c28186.tar nixpkgs-c76a931faa43b6e989de32f96b56fcce37c28186.tar.gz nixpkgs-c76a931faa43b6e989de32f96b56fcce37c28186.tar.bz2 nixpkgs-c76a931faa43b6e989de32f96b56fcce37c28186.tar.lz nixpkgs-c76a931faa43b6e989de32f96b56fcce37c28186.tar.xz nixpkgs-c76a931faa43b6e989de32f96b56fcce37c28186.tar.zst nixpkgs-c76a931faa43b6e989de32f96b56fcce37c28186.zip | |
The postgresql distribution no longer contains the JDBC driver
svn path=/nixpkgs/trunk/; revision=3123
Diffstat (limited to 'pkgs/servers/sql')
| -rwxr-xr-x | pkgs/servers/sql/postgresql/builder.sh | 8 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/servers/sql/postgresql/builder.sh b/pkgs/servers/sql/postgresql/builder.sh index 0ecefd3a545..26144d2d02a 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 acb0b1d41a3..ac0b2d601d9 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]; } |