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

* Let subversitnWithJava use jdk in stead of blackdown

Browse Source 
* Disable jikes when building subversion with javahl bindings


svn path=/nixpkgs/trunk/; revision=4589
This commit is contained in:
Roy van den Broek 2006-01-25 14:03:55 +00:00
parent 84e89e2fca
commit af5e956d23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/subversion-1.2.x/builder.sh
View File

@ -23,7 +23,7 @@ if test -n "$pythonBindings"; then
fi fi
if test "$javahlBindings"; then if test "$javahlBindings"; then
configureFlags="--enable-javahl --with-jdk=$jdk $configureFlags" configureFlags="--enable-javahl --with-jdk=$jdk --with-jikes=no $configureFlags"
fi fi
installFlags="$makeFlags" installFlags="$makeFlags"

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

@ -1734,14 +1734,13 @@ rec {
}; };
subversionWithJava = (import ../applications/version-management/subversion-1.2.x) { subversionWithJava = (import ../applications/version-management/subversion-1.2.x) {
inherit fetchurl stdenv openssl db4 expat; inherit fetchurl stdenv openssl db4 expat jdk;
swig = swigWithJava; swig = swigWithJava;
localServer = true; localServer = true;
httpServer = false; httpServer = false;
sslSupport = true; sslSupport = true;
httpd = apacheHttpd; httpd = apacheHttpd;
javahlBindings = true; javahlBindings = true;
jdk = blackdown;
}; };
rcs = (import ../applications/version-management/rcs) { rcs = (import ../applications/version-management/rcs) {