···

       
22
       
22
       
 
       


     

       
23
       
23
       
 
       
buildPythonPackage rec {

     

       
24
       
24
       
 
       
  pname = "cairocffi";

     

       
25
       
25
       
-
       
  version = "1.6.1";

     

       
25
       
25
       
+
       
  version = "1.7.1";

     

       
26
       
26
       
 
       
  format = "pyproject";

     

       
27
       
27
       
 
       


     

       
28
       
28
       
 
       
  disabled = pythonOlder "3.7";

     

       
29
       
29
       
 
       


     

       
30
       
30
       
 
       
  src = fetchPypi {

     

       
31
       
31
       
 
       
    inherit pname version;

     

       
32
       
32
       
-
       
    hash = "sha256-eOa75HNXZAxFPQvpKfpJzQXM4uEobz0qHKnL2n79uLc=";

     

       
32
       
32
       
+
       
    hash = "sha256-LkjuhkiE7Eo6NL+oyauZmfaIKG63FKFaQ+ydBow2VXs=";

     

       
33
       
33
       
 
       
  };

     

       
34
       
34
       
 
       


     

       
35
       
35
       
 
       
  patches = [

     

···

       
1
       
1
       
 
       
Patch dlopen() to allow direct paths to all required libs

     

       
2
       
2
       
 
       


     

       
3
       
3
       
-
       
This is an update of the patch submitted in

     

       
4
       
4
       
-
       
https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4

     

       
5
       
5
       
-
       
by Alexander V. Nikolaev <avn@avnik.info>

     

       
6
       
6
       
-
       


     

       
7
       
7
       
-
       
---

     

       
8
       
8
       
-
       
 cairocffi/__init__.py | 34 ++++++++++++++++------------------

     

       
9
       
9
       
-
       
 1 file changed, 16 insertions(+), 18 deletions(-)

     

       
10
       
10
       
-
       


     

       
11
       
3
       
 
       
diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py

     

       
12
       
12
       
-
       
index 307d58c..43c29e3 100644

     

       
4
       
4
       
+
       
index f917d90..31dab12 100644

     

       
13
       
5
       
 
       
--- a/cairocffi/__init__.py

     

       
14
       
6
       
 
       
+++ b/cairocffi/__init__.py

     

       
15
       
15
       
-
       
@@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()

     

       
7
       
7
       
+
       
@@ -22,6 +22,14 @@ VERSION = __version__ = '1.7.1'

     

       
16
       
8
       
 
       
 version = '1.17.2'

     

       
17
       
9
       
 
       
 version_info = (1, 17, 2)

     

       
18
       
18
       
-
       


     

       
10
       
10
       
+
       
 

     

       
19
       
11
       
 
       
+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be

     

       
20
       
12
       
 
       
+# required for runtime

     

       
21
       
13
       
 
       
+_LIBS = {

     
···

       
24
       
16
       
 
       
+    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',

     

       
25
       
17
       
 
       
+    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',

     

       
26
       
18
       
 
       
+}

     

       
27
       
27
       
-
       
+

     

       
28
       
28
       
-
       


     

       
19
       
19
       
+
       
 

     

       
20
       
20
       
+
       
 # Python 3.8 no longer searches for DLLs in PATH, so we can add everything in

     

       
21
       
21
       
+
       
 # CAIROCFFI_DLL_DIRECTORIES manually. Note that unlike PATH, add_dll_directory

     

       
22
       
22
       
+
       
@@ -36,26 +44,14 @@ if dll_directories and hasattr(os, 'add_dll_directory'):

     

       
23
       
23
       
+
       
 

     

       
29
       
24
       
 
       
 def dlopen(ffi, library_names, filenames):

     

       
30
       
25
       
 
       
     """Try various names for the same library, for different platforms."""

     

       
31
       
26
       
 
       
-    exceptions = []

     
···

       
33
       
28
       
 
       
     for library_name in library_names:

     

       
34
       
29
       
 
       
-        library_filename = find_library(library_name)

     

       
35
       
30
       
 
       
-        if library_filename:

     

       
36
       
36
       
-
       
-            filenames = (library_filename,) + filenames

     

       
31
       
31
       
+
       
-            filenames = (library_filename, *filenames)

     

       
37
       
32
       
 
       
-        else:

     

       
38
       
33
       
 
       
-            exceptions.append(

     

       
39
       
34
       
 
       
-                'no library called "{}" was found'.format(library_name))

     
···

       
52
       
47
       
 
       
+            lib = ffi.dlopen(path)

     

       
53
       
48
       
 
       
+            if lib:

     

       
54
       
49
       
 
       
+                return lib

     

       
55
       
55
       
-
       
+

     

       
50
       
50
       
+
       
 

     

       
56
       
51
       
 
       
+    raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path))

     

       
57
       
57
       
-
       


     

       
58
       
58
       
-
       


     

       
52
       
52
       
+
       
 

     

       
59
       
53
       
 
       
 cairo = dlopen(

     

       
60
       
60
       
-
       
--

     

       
61
       
61
       
-
       
2.19.2

     

       
54
       
54
       
+
       
     ffi, ('cairo-2', 'cairo', 'libcairo-2'),