about summary refs log tree commit diff
path: root/pkgs/development/python-modules/JPype1
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-02-15 13:17:40 -0500
committerShea Levy <shea@shealevy.com>2018-02-15 13:17:40 -0500
commit29536db9afc7656d0a3b89aeabe0c3b3725f5444 (patch)
tree40a7c07b661d541b529940ad9f812abefc2db1a5 /pkgs/development/python-modules/JPype1
parent5812195f81203841973e4805ac2d20f78d0b3974 (diff)
Add missing files
Diffstat (limited to 'pkgs/development/python-modules/JPype1')
-rw-r--r--pkgs/development/python-modules/JPype1/default.nix22
-rw-r--r--pkgs/development/python-modules/JPype1/set-compiler-language.patch12
2 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix
new file mode 100644
index 0000000000000..b52871793bee8
--- /dev/null
+++ b/pkgs/development/python-modules/JPype1/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "JPype1";
+  version = "0.6.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09bzmnzkjbrf60h39wapxc1l8mb3r9km486cly0mm78bv096884r";
+  };
+
+  patches = [ ./set-compiler-language.patch ];
+
+  # Test loader complains about non-test module on python3.
+  doCheck = !isPy3k;
+
+  meta = {
+    homepage = "https://github.com/originell/jpype/";
+    license = "License :: OSI Approved :: Apache Software License";
+    description = "A Python to Java bridge.";
+  };
+}
diff --git a/pkgs/development/python-modules/JPype1/set-compiler-language.patch b/pkgs/development/python-modules/JPype1/set-compiler-language.patch
new file mode 100644
index 0000000000000..1d5921a6ffabb
--- /dev/null
+++ b/pkgs/development/python-modules/JPype1/set-compiler-language.patch
@@ -0,0 +1,12 @@
+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