diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-02 11:49:21 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-02 11:49:21 +0000 |
commit | 4041f93fbfe0eb6eed0b02f9045e286aed9451ca (patch) | |
tree | 7528d944a26f79fdd0a342c7be0d47cb322dedb0 /pkgs/development | |
parent | d68835524d21e774c76685d84f9b6b54b8b385b9 (diff) | |
download | nixlib-4041f93fbfe0eb6eed0b02f9045e286aed9451ca.tar nixlib-4041f93fbfe0eb6eed0b02f9045e286aed9451ca.tar.gz nixlib-4041f93fbfe0eb6eed0b02f9045e286aed9451ca.tar.bz2 nixlib-4041f93fbfe0eb6eed0b02f9045e286aed9451ca.tar.lz nixlib-4041f93fbfe0eb6eed0b02f9045e286aed9451ca.tar.xz nixlib-4041f93fbfe0eb6eed0b02f9045e286aed9451ca.tar.zst nixlib-4041f93fbfe0eb6eed0b02f9045e286aed9451ca.zip |
* SWIG apparently doesn't need Perl/Python/Guile/JDK/20 other
languages at build time. It seems they're only used in "make check". * Subversion: updated to 1.6.5. svn path=/nixpkgs/trunk/; revision=17594
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/misc/swig/default.nix | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index ea95279a6272..d711e7a44d9a 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -1,15 +1,4 @@ -{ /* 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 }: - -assert perlSupport -> perl != null; -assert pythonSupport -> python != null; -assert guileSupport -> guile != null; -assert javaSupport -> jdk != null; +{ stdenv, fetchurl, boost }: stdenv.mkDerivation rec { name = "swig-1.3.40"; @@ -19,11 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r"; }; - buildInputs = [ boost ] # Boost is used in the test suite - ++ stdenv.lib.optional perlSupport perl - ++ stdenv.lib.optional pythonSupport python - ++ stdenv.lib.optional guileSupport guile - ++ stdenv.lib.optional javaSupport jdk; + #buildInputs = [ boost ]; # needed for `make check' /* The test suite fails this way: @@ -36,11 +21,6 @@ stdenv.mkDerivation rec { */ doCheck = false; - passthru = { - inherit perl python jdk guile; - inherit perlSupport pythonSupport guileSupport javaSupport; - }; - meta = { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; |