Keep only one SWIG, with support for all languages.

svn path=/nixpkgs/trunk/; revision=17351

2 files changed, 8 insertions, 14 deletions

diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index 867f37440324..ea95279a6272 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -1,4 +1,8 @@
-{ perlSupport, pythonSupport, javaSupport, guileSupport
+{ /* SWIG doesn't carry any run-time dependency on Perl, Python, etc., so
+     it's safe to enable everything by default.  */
+  perlSupport ? true, pythonSupport ? true, javaSupport ? true
+, guileSupport ? true
+
 , stdenv, fetchurl, boost, perl ? null, python ? null, jdk ? null
 , guile ? null }:
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04e6a090d2da..54b26e04bfa6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2772,25 +2772,15 @@ let
   };
 
   swig = import ../development/tools/misc/swig {
-    inherit fetchurl stdenv boost perl python guile;
-    perlSupport = true;
-    pythonSupport = true;
-    guileSupport = true;
-    javaSupport = false;
+    inherit fetchurl stdenv boost perl python guile jdk;
   };
 
+  swigWithJava = swig;
+
   swftools = import ../tools/video/swftools {
     inherit fetchurl stdenv x264 zlib libjpeg freetype giflib;
   };
 
-  swigWithJava = lowPrio (appendToName "with-java" (import ../development/tools/misc/swig {
-    inherit fetchurl stdenv boost jdk;
-    perlSupport = false;
-    pythonSupport = false;
-    guileSupport = false;
-    javaSupport = true;
-  }));
-
   texinfo49 = import ../development/tools/misc/texinfo/4.9.nix {
     inherit fetchurl stdenv ncurses;
   };