Fix broken X11 override and detection

moderngl · Feb 16, 2021 · ebd996a · ebd996a
1 parent 4c50140
commit ebd996a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/glcontext/__init__.py b/glcontext/__init__.py
@@ -73,13 +73,12 @@ def create(*args, **kwargs):
         if not kwargs.get('libgl'):
             kwargs['libgl'] = find_library('GL') 
 
-        libx11 = find_library("X11")
-        if not libx11:
-            raise SystemError("Cannot find the X11 library")
+        if not kwargs.get('libx11'):
+            kwargs['libx11'] = find_library("X11")
 
         _apply_env_var(kwargs, 'glversion', 'GLCONTEXT_GLVERSION', arg_type=int)
         _apply_env_var(kwargs, 'libgl', 'GLCONTEXT_LINUX_LIBGL')
-        _apply_env_var(kwargs, libx11, 'GLCONTEXT_LINUX_LIBX11')
+        _apply_env_var(kwargs, 'libx11', 'GLCONTEXT_LINUX_LIBX11')
         kwargs = _strip_kwargs(kwargs, ['glversion', 'mode', 'libgl', 'libx11'])
         return x11.create_context(**kwargs)
 
@@ -134,3 +133,4 @@ def _apply_env_var(kwargs, arg_name, env_name, arg_type=str):
     value = os.environ.get(env_name, kwargs.get(arg_name))
     if value:
         kwargs[arg_name] = arg_type(value)
+