diff options
author | wmertens <Wout.Mertens@gmail.com> | 2014-04-20 07:47:22 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-05-26 21:50:27 +0200 |
commit | 8ad1a0ceaf1b924f9893c45b3e13bcb63d6702af (patch) | |
tree | 7c6764f834f8ee3e646adb4e985ff8251ce6d0fb /pkgs | |
parent | 25ea04f2c98c1ecc538d0aa52815cf68b8a00bb5 (diff) |
swig: enable on Darwin (close #2326)
Verified on OS X 10.9.2 to build and check, dependents build fine too. @vcunat enabled doCheck as it works for him on x86_64-linux; also did style nitpick modification, and changed platforms to .all according to the homepage http://www.swig.org/compat.html
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/misc/swig/default.nix | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index d489feba4dc5a..80c6b20e69d02 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost }: +{ stdenv, fetchurl, boost, tcl }: stdenv.mkDerivation rec { name = "swig-1.3.40"; @@ -8,18 +8,9 @@ stdenv.mkDerivation rec { sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r"; }; - #buildInputs = [ boost ]; # needed for `make check' - - /* The test suite fails this way: - - building python_cpp - python: tpp.c:63: __pthread_tpp_change_priority: Assertion `new_prio == -1 || (new_prio >= __sched_fifo_min_prio && new_prio <= __sched_fifo_max_prio)' failed. - /bin/sh: line 1: 32101 Aborted env LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH PYTHONPATH=.:$PYTHONPATH python ./li_boost_shared_ptr_runme.py - make[1]: *** [li_boost_shared_ptr.cpptest] Error 134 - - This may be an uninitialized mutex or mutexattr or something. - */ - doCheck = false; + doCheck = true; + # 'make check' uses boost and tcl + buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; meta = { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; @@ -39,7 +30,7 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; |