diff options
| author | Roy van den Broek <rbroek@cs.uu.nl> | 2006-01-25 14:03:55 +0000 |
|---|---|---|
| committer | Roy van den Broek <rbroek@cs.uu.nl> | 2006-01-25 14:03:55 +0000 |
| commit | af5e956d238f97cd043f4a77cbf0775583b42515 (patch) | |
| tree | 5304e69517496228f4037e8b7ff433d91ce17e12 /pkgs/system/all-packages-generic.nix | |
| parent | 84e89e2fca6be0da03d1fddf9416225b2bbf3b02 (diff) | |
| download | nixpkgs-af5e956d238f97cd043f4a77cbf0775583b42515.tar nixpkgs-af5e956d238f97cd043f4a77cbf0775583b42515.tar.gz nixpkgs-af5e956d238f97cd043f4a77cbf0775583b42515.tar.bz2 nixpkgs-af5e956d238f97cd043f4a77cbf0775583b42515.tar.lz nixpkgs-af5e956d238f97cd043f4a77cbf0775583b42515.tar.xz nixpkgs-af5e956d238f97cd043f4a77cbf0775583b42515.tar.zst nixpkgs-af5e956d238f97cd043f4a77cbf0775583b42515.zip | |
* Let subversitnWithJava use jdk in stead of blackdown
* Disable jikes when building subversion with javahl bindings svn path=/nixpkgs/trunk/; revision=4589
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 1b8f0b7c5d0..d4c7bf3382e 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) { |