vispy: init at 0.6.4

This commit is contained in:
Daniel Goertzen 2020-02-04 13:54:20 -06:00
parent 5142e21492
commit 81bc4bb78a
3 changed files with 80 additions and 0 deletions

View file

@ -0,0 +1,39 @@
{ lib, buildPythonPackage, substituteAll, stdenv,
fetchPypi, numpy, cython, freetype-py, fontconfig, libGL,
setuptools_scm, setuptools-scm-git-archive
}:
buildPythonPackage rec {
pname = "vispy";
version = "0.6.4";
src = fetchPypi {
inherit pname version;
sha256 = "07sb4qww6mgzm66qsrr3pd66yz39r6jj4ibb3qmfg1kwnxs6ayv2";
};
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
];
propagatedBuildInputs = [
numpy freetype-py fontconfig libGL
];
doCheck = false; # otherwise runs OSX code on linux.
meta = with lib; {
homepage = http://vispy.org/index.html;
description = "Interactive scientific visualization in Python";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}

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():

View file

@ -5973,6 +5973,8 @@ in {
virtualenv = callPackage ../development/python-modules/virtualenv { };
vispy = callPackage ../development/python-modules/vispy { };
vsts = callPackage ../development/python-modules/vsts { };
vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { };