Keep only one SWIG, with support for all languages.
svn path=/nixpkgs/trunk/; revision=17351
This commit is contained in:
parent
4c759795e0
commit
7735b54340
2 changed files with 8 additions and 14 deletions
|
@ -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 }:
|
||||
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue