diff options
| author | Ali Abrar <aliabrar@gmail.com> | 2020-12-30 11:08:17 -0500 |
|---|---|---|
| committer | Ali Abrar <aliabrar@gmail.com> | 2020-12-30 11:08:17 -0500 |
| commit | efd8dec00f77b0bafb1a7190948eb987fa23330e (patch) | |
| tree | 9e030073bab5eaa50d82fd75fcf46a6a662ba95e /pkgs/development/python-modules/weasyprint | |
| parent | 7b968c79a15796c524b75a0e43d643e36aa10e97 (diff) | |
| download | nixpkgs-efd8dec00f77b0bafb1a7190948eb987fa23330e.tar nixpkgs-efd8dec00f77b0bafb1a7190948eb987fa23330e.tar.gz nixpkgs-efd8dec00f77b0bafb1a7190948eb987fa23330e.tar.bz2 nixpkgs-efd8dec00f77b0bafb1a7190948eb987fa23330e.tar.lz nixpkgs-efd8dec00f77b0bafb1a7190948eb987fa23330e.tar.xz nixpkgs-efd8dec00f77b0bafb1a7190948eb987fa23330e.tar.zst nixpkgs-efd8dec00f77b0bafb1a7190948eb987fa23330e.zip | |
python-modules.weasyprint: 50 -> 52
Diffstat (limited to 'pkgs/development/python-modules/weasyprint')
| -rw-r--r-- | pkgs/development/python-modules/weasyprint/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/weasyprint/library-paths.patch | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index c1eaa1fd754..06f7a9f1011 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "50"; + version = "52"; disabled = !isPy3k; # excluded test needs the Ahem font @@ -59,7 +59,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "WeasyPrint"; - sha256 = "0invs96zvmcr6wh5klj52jrcnr9qg150v9wpmbhcsf3vv1d1hbcw"; + sha256 = "0rwf43111ws74m8b1alkkxzz57g0np3vmd8as74adwnxslfcg4gs"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/weasyprint/library-paths.patch b/pkgs/development/python-modules/weasyprint/library-paths.patch index eabbdbdcd6e..c6eb87c9458 100644 --- a/pkgs/development/python-modules/weasyprint/library-paths.patch +++ b/pkgs/development/python-modules/weasyprint/library-paths.patch @@ -1,8 +1,8 @@ diff --git a/weasyprint/fonts.py b/weasyprint/fonts.py -index 377716c1..2016e01c 100644 +index 79e3b5b..4438eb4 100644 --- a/weasyprint/fonts.py +++ b/weasyprint/fonts.py -@@ -48,11 +48,8 @@ else: +@@ -45,11 +45,8 @@ else: # with OSError: dlopen() failed to load a library: cairo / cairo-2 # So let's hope we find the same file as cairo already did ;) # Same applies to pangocairo requiring pangoft2 @@ -10,26 +10,26 @@ index 377716c1..2016e01c 100644 - 'libfontconfig-1.dll', - 'libfontconfig.so.1', 'libfontconfig-1.dylib') - pangoft2 = dlopen(ffi, 'pangoft2-1.0', 'libpangoft2-1.0-0', -- 'libpangoft2-1.0.so', 'libpangoft2-1.0.dylib') +- 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib') + fontconfig = dlopen(ffi, '@fontconfig@') + pangoft2 = dlopen(ffi, '@pangoft2@') ffi.cdef(''' // FontConfig diff --git a/weasyprint/text.py b/weasyprint/text.py -index 035074e9..08e40395 100644 +index 1dc5e4d..b070bad 100644 --- a/weasyprint/text.py +++ b/weasyprint/text.py -@@ -243,12 +243,9 @@ def dlopen(ffi, *names): +@@ -255,12 +255,9 @@ def dlopen(ffi, *names): return ffi.dlopen(names[0]) # pragma: no cover --gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so', +-gobject = dlopen(ffi, 'gobject-2.0', 'libgobject-2.0-0', 'libgobject-2.0.so.0', - 'libgobject-2.0.dylib') --pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so', +-pango = dlopen(ffi, 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so.0', - 'libpango-1.0.dylib') -pangocairo = dlopen(ffi, 'pangocairo-1.0', 'libpangocairo-1.0-0', -- 'libpangocairo-1.0.so', 'libpangocairo-1.0.dylib') +- 'libpangocairo-1.0.so.0', 'libpangocairo-1.0.dylib') +gobject = dlopen(ffi, '@gobject@') +pango = dlopen(ffi, '@pango@') +pangocairo = dlopen(ffi, '@pangocairo@') |