BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Keep only one SWIG, with support for all languages.

Browse source 
svn path=/nixpkgs/trunk/; revision=17351
This commit is contained in:
Ludovic Courtès 2009-09-22 11:59:41 +00:00
parent 4c759795e0
commit 7735b54340
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/tools/misc/swig/default.nix
View file

@ -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 , stdenv, fetchurl, boost, perl ? null, python ? null, jdk ? null
, guile ? null }: , guile ? null }:

16
pkgs/top-level/all-packages.nix
View file

@ -2772,25 +2772,15 @@ let
}; };
swig = import ../development/tools/misc/swig { swig = import ../development/tools/misc/swig {
inherit fetchurl stdenv boost perl python guile; inherit fetchurl stdenv boost perl python guile jdk;
perlSupport = true;
pythonSupport = true;
guileSupport = true;
javaSupport = false;
}; };
swigWithJava = swig;
swftools = import ../tools/video/swftools { swftools = import ../tools/video/swftools {
inherit fetchurl stdenv x264 zlib libjpeg freetype giflib; 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 { texinfo49 = import ../development/tools/misc/texinfo/4.9.nix {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };