diff --git a/pkgs/applications/version-management/subversion-1.2.x/builder.sh b/pkgs/applications/version-management/subversion-1.2.x/builder.sh index ae36439da8fc..5111335ffc8d 100644 --- a/pkgs/applications/version-management/subversion-1.2.x/builder.sh +++ b/pkgs/applications/version-management/subversion-1.2.x/builder.sh @@ -23,7 +23,7 @@ if test -n "$pythonBindings"; then fi if test "$javahlBindings"; then - configureFlags="--enable-javahl --with-jdk=$jdk $configureFlags" + configureFlags="--enable-javahl --with-jdk=$jdk --with-jikes=no $configureFlags" fi installFlags="$makeFlags" diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 1b8f0b7c5d01..d4c7bf3382ef 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1734,14 +1734,13 @@ rec { }; subversionWithJava = (import ../applications/version-management/subversion-1.2.x) { - inherit fetchurl stdenv openssl db4 expat; + inherit fetchurl stdenv openssl db4 expat jdk; swig = swigWithJava; localServer = true; httpServer = false; sslSupport = true; httpd = apacheHttpd; javahlBindings = true; - jdk = blackdown; }; rcs = (import ../applications/version-management/rcs) {