git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #80838 from maxxk/pyfribidi-fix

pythonPackages.pyfribidi: fix build

commit4441a6a8a43972556603a9de751e1c77bba64ae6 authorDaniel Schaefer <git@danielschaefer.me> dateSun 23 Feb 2020, 16:22 (7 years ago) parentc0c1f11a517238
2 files changed+23−2
pkgs/development/python-modules/pyfribidi/default.nix+6−2 pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch+17
pkgs/development/python-modules/pyfribidi/default.nix+6−2
@@ -1,14 +1,14 @@
11{ stdenv
22, buildPythonPackage
33, fetchPypi
4−, isPy3k
54, isPyPy
5+, six
66}:
77
88buildPythonPackage rec {
99 version = "0.12.0";
1010 pname = "pyfribidi";
11− disabled = isPy3k || isPyPy;
11+ disabled = isPyPy;
1212
1313 src = fetchPypi {
1414 inherit pname version;
@@ -16,6 +16,10 @@ buildPythonPackage rec {
1616 sha256 = "64726a4a56783acdc79c6b9b3a15f16e6071077c897a0b999f3b43f744bc621c";
1717 };
1818
19+ patches = stdenv.lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch;
20+
21+ propagatedBuildInputs = [ six ];
22+
1923 meta = with stdenv.lib; {
2024 description = "A simple wrapper around fribidi";
2125 homepage = https://github.com/pediapress/pyfribidi;
pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patchnew file+17
@@ -0,0 +1,17 @@
1+diff --git a/pyfribidi.c b/pyfribidi.c
2+index 9a0120d..238134a 100644
3+--- a/pyfribidi.c
4++++ b/pyfribidi.c
5+@@ -148,10 +148,11 @@ init_pyfribidi (void)
6+ {
7+ #if PY_MAJOR_VERSION >= 3
8+ PyObject *module = PyModule_Create (&pyfribidi_moduledef);
9++ if (module == NULL) return NULL;
10+ #else
11+ PyObject *module = Py_InitModule ("_pyfribidi", PyfribidiMethods);
12++ if (module == NULL) return;
13+ #endif
14+- if (module == NULL) return NULL;
15+
16+ PyModule_AddIntConstant (module, "RTL", (long) FRIBIDI_TYPE_RTL);
17+ PyModule_AddIntConstant (module, "LTR", (long) FRIBIDI_TYPE_LTR);