uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
78
pkgs/development/python-modules/cairocffi/default.nix
Normal file
78
pkgs/development/python-modules/cairocffi/default.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
# FIXME: make gdk-pixbuf dependency optional
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, lib
|
||||
, substituteAll
|
||||
, makeFontsConf
|
||||
, freefont_ttf
|
||||
, pytest
|
||||
, glibcLocales
|
||||
, cairo
|
||||
, cffi
|
||||
, numpy
|
||||
, withXcffib ? false
|
||||
, xcffib
|
||||
, python
|
||||
, glib
|
||||
, gdk-pixbuf
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cairocffi";
|
||||
version = "1.3.0";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-EIo6fLCeIDvdhQHZuq2R14bSBFYb1x6TZOizSJfEe5E=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
# checkPhase require at least one 'normal' font and one 'monospace',
|
||||
# otherwise glyph tests fails
|
||||
FONTCONFIG_FILE = makeFontsConf {
|
||||
fontDirectories = [ freefont_ttf ];
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib;
|
||||
propagatedNativeBuildInputs = [ cffi ];
|
||||
|
||||
# pytestCheckHook does not work
|
||||
checkInputs = [ numpy pytest glibcLocales ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "pytest-runner" "" \
|
||||
--replace "pytest-cov" "" \
|
||||
--replace "pytest-flake8" "" \
|
||||
--replace "pytest-isort" "" \
|
||||
--replace "--flake8 --isort" ""
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
py.test $out/${python.sitePackages}
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0
|
||||
(substituteAll {
|
||||
src = ./dlopen-paths.patch;
|
||||
ext = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
cairo = cairo.out;
|
||||
glib = glib.out;
|
||||
gdk_pixbuf = gdk-pixbuf.out;
|
||||
})
|
||||
./fix_test_scaled_font.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/SimonSapin/cairocffi";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
description = "cffi-based cairo bindings for Python";
|
||||
};
|
||||
}
|
||||
61
pkgs/development/python-modules/cairocffi/dlopen-paths.patch
Normal file
61
pkgs/development/python-modules/cairocffi/dlopen-paths.patch
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
Patch dlopen() to allow direct paths to all required libs
|
||||
|
||||
This is an update of the patch submitted in
|
||||
https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4
|
||||
by Alexander V. Nikolaev <avn@avnik.info>
|
||||
|
||||
---
|
||||
cairocffi/__init__.py | 34 ++++++++++++++++------------------
|
||||
1 file changed, 16 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
|
||||
index 307d58c..43c29e3 100644
|
||||
--- a/cairocffi/__init__.py
|
||||
+++ b/cairocffi/__init__.py
|
||||
@@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
|
||||
version = '1.17.2'
|
||||
version_info = (1, 17, 2)
|
||||
|
||||
+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be
|
||||
+# required for runtime
|
||||
+_LIBS = {
|
||||
+ 'cairo': '@cairo@/lib/libcairo@ext@',
|
||||
+ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
|
||||
+ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
|
||||
+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
|
||||
+}
|
||||
+
|
||||
|
||||
def dlopen(ffi, library_names, filenames):
|
||||
"""Try various names for the same library, for different platforms."""
|
||||
- exceptions = []
|
||||
-
|
||||
for library_name in library_names:
|
||||
- library_filename = find_library(library_name)
|
||||
- if library_filename:
|
||||
- filenames = (library_filename,) + filenames
|
||||
- else:
|
||||
- exceptions.append(
|
||||
- 'no library called "{}" was found'.format(library_name))
|
||||
-
|
||||
- for filename in filenames:
|
||||
- try:
|
||||
- return ffi.dlopen(filename)
|
||||
- except OSError as exception: # pragma: no cover
|
||||
- exceptions.append(exception)
|
||||
-
|
||||
- error_message = '\n'.join( # pragma: no cover
|
||||
- str(exception) for exception in exceptions)
|
||||
- raise OSError(error_message) # pragma: no cover
|
||||
+ path = _LIBS.get(library_name, None)
|
||||
+ if path:
|
||||
+ lib = ffi.dlopen(path)
|
||||
+ if lib:
|
||||
+ return lib
|
||||
+
|
||||
+ raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path))
|
||||
|
||||
|
||||
cairo = dlopen(
|
||||
--
|
||||
2.19.2
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- a/cairocffi/test_cairo.py 2016-09-01 07:52:33.303180302 +0200
|
||||
+++ b/cairocffi/test_cairo.py 2016-09-01 09:06:19.595701944 +0200
|
||||
@@ -998,7 +998,7 @@
|
||||
|
||||
font = ScaledFont(ToyFontFace('monospace'))
|
||||
_, _, _, _, x_advance_mono, y_advance = font.text_extents('i' * 10)
|
||||
- assert x_advance_mono > x_advance
|
||||
+ assert x_advance_mono >= x_advance
|
||||
assert y_advance == 0
|
||||
# Not much we can test:
|
||||
# The toy font face was "materialized" into a specific backend.
|
||||
Loading…
Add table
Add a link
Reference in a new issue