diff options
| author | Daniël de Kok <me@danieldk.eu> | 2018-09-03 15:47:04 +0200 |
|---|---|---|
| committer | Daniël de Kok <me@danieldk.eu> | 2018-09-03 15:47:04 +0200 |
| commit | 875bb6bcb98de45bcc54c50cf4428ca9e3b1f7b5 (patch) | |
| tree | 9d8aeb9fcbb90ddee84c0c067d2303ee547f8fea | |
| parent | 252c0d4c82b70ede96cb669485f78aaa99400921 (diff) | |
| download | nixlib-875bb6bcb98de45bcc54c50cf4428ca9e3b1f7b5.tar nixlib-875bb6bcb98de45bcc54c50cf4428ca9e3b1f7b5.tar.gz nixlib-875bb6bcb98de45bcc54c50cf4428ca9e3b1f7b5.tar.bz2 nixlib-875bb6bcb98de45bcc54c50cf4428ca9e3b1f7b5.tar.lz nixlib-875bb6bcb98de45bcc54c50cf4428ca9e3b1f7b5.tar.xz nixlib-875bb6bcb98de45bcc54c50cf4428ca9e3b1f7b5.tar.zst nixlib-875bb6bcb98de45bcc54c50cf4428ca9e3b1f7b5.zip | |
vowpalwabbit: fix build against boost-python.
Patch setup.py to look for libboost_python{Major}{Minor}.
| -rw-r--r-- | pkgs/development/python-modules/vowpalwabbit/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff | 16 |
2 files changed, 24 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index a8661fd3a985..6ee6e42e97d9 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -9,13 +9,20 @@ buildPythonPackage rec { inherit pname version; sha256 = "0b517371fc64f1c728a0af42a31fa93def27306e9b4d25d6e5fd01bcff1b7304"; }; + + # Should be fixed in next Python release after 8.5.0: + # https://github.com/JohnLangford/vowpal_wabbit/pull/1533 + patches = [ + ./vowpal-wabbit-find-boost.diff + ]; + # vw tries to write some explicit things to home # python installed: The directory '/homeless-shelter/.cache/pip/http' preInstall = '' export HOME=$PWD ''; - buildInputs = [ boost.dev zlib.dev clang ncurses pytest docutils pygments ]; + buildInputs = [ python.pkgs.boost zlib.dev clang ncurses pytest docutils pygments ]; propagatedBuildInputs = [ numpy scipy scikitlearn ]; checkPhase = '' diff --git a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff new file mode 100644 index 000000000000..0e7b13c01030 --- /dev/null +++ b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff @@ -0,0 +1,16 @@ +--- vowpalwabbit-8.5.0.orig/setup.py 2018-09-03 14:27:22.833621339 +0200 ++++ vowpalwabbit-8.5.0/setup.py 2018-09-03 14:37:18.076127914 +0200 +@@ -25,12 +25,7 @@ + """Find correct boost-python library information """ + if system == 'Linux': + # use version suffix if present +- boost_lib = 'boost_python-py{v[0]}{v[1]}'.format(v=sys.version_info) +- if sys.version_info.major == 3: +- for candidate in ['-py36', '-py35', '-py34', '3']: +- boost_lib = 'boost_python{}'.format(candidate) +- if find_library(boost_lib): +- exit ++ boost_lib = 'boost_python{v[0]}{v[1]}'.format(v=sys.version_info) + if not find_library(boost_lib): + boost_lib = "boost_python" + elif system == 'Darwin': |