Merge pull request #307098 from r-ryantm/auto-update/cilium-cli
[NixPkgs.git] / pkgs / development / python-modules / vispy / library-paths.patch
blob05b583c12e4f600266e578a0c186e1378a047b4a
1 diff --git a/vispy/ext/fontconfig.py b/vispy/ext/fontconfig.py
2 index ff24662b..6a5079f0 100644
3 --- a/vispy/ext/fontconfig.py
4 +++ b/vispy/ext/fontconfig.py
5 @@ -7,10 +7,7 @@ from ..util.wrappers import run_subprocess
7 # Some code adapted from Pyglet
9 -fc = util.find_library('fontconfig')
10 -if fc is None:
11 - raise ImportError('fontconfig not found')
12 -fontconfig = cdll.LoadLibrary(fc)
13 +fontconfig = cdll.LoadLibrary('@fontconfig@')
15 FC_FAMILY = 'family'.encode('ASCII')
16 FC_SIZE = 'size'.encode('ASCII')
17 diff --git a/vispy/gloo/gl/gl2.py b/vispy/gloo/gl/gl2.py
18 index d5bd9c38..63350e73 100644
19 --- a/vispy/gloo/gl/gl2.py
20 +++ b/vispy/gloo/gl/gl2.py
21 @@ -39,16 +39,8 @@ elif sys.platform.startswith('win'):
22 pass
23 else:
24 # Unix-ish
25 - if sys.platform.startswith('darwin'):
26 - _fname = ctypes.util.find_library('OpenGL')
27 - else:
28 - _fname = ctypes.util.find_library('GL')
29 - if not _fname:
30 - logger.warning('Could not load OpenGL library.')
31 - _lib = None
32 - else:
33 - # Load lib
34 - _lib = ctypes.cdll.LoadLibrary(_fname)
35 + # Load lib
36 + _lib = ctypes.cdll.LoadLibrary("@gl@")
39 def _have_context():