pythonPackages.JPype1: refactor fix broken build

This commit is contained in:
Chris Ostrouchov 2020-01-01 10:19:22 -05:00 committed by Jon
parent 367085bc8a
commit 3c0d4f2dc3
2 changed files with 14 additions and 21 deletions

@ -1,4 +1,8 @@
{ buildPythonPackage, fetchPypi, pytest }:
{ lib
, buildPythonPackage
, fetchPypi
, pytest
}:
buildPythonPackage rec {
pname = "JPype1";
@ -9,16 +13,17 @@ buildPythonPackage rec {
sha256 = "c16d01cde9c2c955d76d45675e64b06c3255784d49cea4147024e99a01fbbb18";
};
patches = [ ./set-compiler-language.patch ];
checkInputs = [
pytest
];
checkInputs = [ pytest ];
# ImportError: Failed to import test module: test.testlucene
# required openjdk (easy) but then there were some class path issues
# when running the tests
doCheck = false;
meta = {
homepage = "https://github.com/originell/jpype/";
license = "License :: OSI Approved :: Apache Software License";
description = "A Python to Java bridge.";
meta = with lib; {
homepage = https://github.com/originell/jpype/;
license = licenses.asl20;
description = "A Python to Java bridge";
};
}

@ -1,12 +0,0 @@
diff -Naur a/setup.py b/setup.py
--- a/setup.py 2017-01-12 19:08:44.000000000 -0500
+++ b/setup.py 2018-02-15 12:28:16.000000000 -0500
@@ -123,7 +123,7 @@
# extra compile args
copt = {'msvc': ['/EHsc'],
- 'unix' : ['-ggdb'],
+ 'unix' : ['-ggdb', '-x', 'c++'],
'mingw32' : [],
}
# extra link args