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:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,73 @@
{ lib
, stdenv
, buildPythonPackage
, substituteAll
, fetchPypi
, cython
, fontconfig
, freetype-py
, hsluv
, kiwisolver
, libGL
, numpy
, setuptools-scm
, setuptools-scm-git-archive
}:
buildPythonPackage rec {
pname = "vispy";
version = "0.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-t2rW8+rK2/xJRM+4IR6ttuqEF6WQmT7OWqfKrAgs/8I=";
};
patches = [
(substituteAll {
src = ./library-paths.patch;
fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}";
gl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];
nativeBuildInputs = [
cython
setuptools-scm
setuptools-scm-git-archive
];
buildInputs = [
libGL
];
propagatedBuildInputs = [
fontconfig
freetype-py
hsluv
kiwisolver
numpy
];
doCheck = false; # otherwise runs OSX code on linux.
pythonImportsCheck = [
"vispy"
"vispy.color"
"vispy.geometry"
"vispy.gloo"
"vispy.glsl"
"vispy.io"
"vispy.plot"
"vispy.scene"
"vispy.util"
"vispy.visuals"
];
meta = with lib; {
homepage = "https://vispy.org/index.html";
description = "Interactive scientific visualization in Python";
license = licenses.bsd3;
maintainers = with maintainers; [ goertzenator ];
};
}

View file

@ -0,0 +1,39 @@
diff --git a/vispy/ext/fontconfig.py b/vispy/ext/fontconfig.py
index ff24662b..6a5079f0 100644
--- a/vispy/ext/fontconfig.py
+++ b/vispy/ext/fontconfig.py
@@ -7,10 +7,7 @@ from ..util.wrappers import run_subprocess
# Some code adapted from Pyglet
-fc = util.find_library('fontconfig')
-if fc is None:
- raise ImportError('fontconfig not found')
-fontconfig = cdll.LoadLibrary(fc)
+fontconfig = cdll.LoadLibrary('@fontconfig@')
FC_FAMILY = 'family'.encode('ASCII')
FC_SIZE = 'size'.encode('ASCII')
diff --git a/vispy/gloo/gl/gl2.py b/vispy/gloo/gl/gl2.py
index d5bd9c38..63350e73 100644
--- a/vispy/gloo/gl/gl2.py
+++ b/vispy/gloo/gl/gl2.py
@@ -39,16 +39,8 @@ elif sys.platform.startswith('win'):
pass
else:
# Unix-ish
- if sys.platform.startswith('darwin'):
- _fname = ctypes.util.find_library('OpenGL')
- else:
- _fname = ctypes.util.find_library('GL')
- if not _fname:
- logger.warning('Could not load OpenGL library.')
- _lib = None
- else:
- # Load lib
- _lib = ctypes.cdll.LoadLibrary(_fname)
+ # Load lib
+ _lib = ctypes.cdll.LoadLibrary("@gl@")
def _have_context():