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

Monetdb: enabling Java support

Browse Source 
svn path=/nixpkgs/trunk/; revision=16479
This commit is contained in:
Marc Weber 2009-07-27 16:05:39 +00:00
parent c3ddc9df62
commit 05259ed635
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/servers/sql/monetdb/default.nix
View File

@ -10,13 +10,18 @@ composableDerivation {} {
sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj"; sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj";
}; };
flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; }; flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; }
// {
java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; };
/* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */
};
buildInputs = [ (pcre.override { unicodeSupport = true; }) buildInputs = [ (pcre.override { unicodeSupport = true; })
openssl readline libxml2]; # optional python perl php java ? openssl readline libxml2]; # optional python perl php java ?
cfg = { cfg = {
geomSupport = true; geomSupport = true;
javaSupport = true;
}; };
configurePhase = ":"; configurePhase = ":";

4
pkgs/top-level/all-packages.nix
View File

@ -4482,8 +4482,8 @@ let
}; };
monetdb = import ../servers/sql/monetdb { monetdb = import ../servers/sql/monetdb {
inherit composableDerivation; inherit composableDerivation getConfig;
inherit fetchurl stdenv pcre openssl readline libxml2 geos; inherit fetchurl stdenv pcre openssl readline libxml2 geos apacheAnt jdk5;
}; };
mysql4 = import ../servers/sql/mysql { mysql4 = import ../servers/sql/mysql {