{libGL, libGLX}: point to libglcapsule and make supporting changes

NixOS · Aug 28, 2024 · 3163476 · 3163476
1 parent 93667ff
commit 3163476
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/nixos/modules/hardware/graphics.nix b/nixos/modules/hardware/graphics.nix
@@ -4,12 +4,12 @@ let
 
   driversEnv = pkgs.buildEnv {
     name = "graphics-drivers";
-    paths = [ cfg.package ] ++ cfg.extraPackages;
+    paths = [ cfg.package pkgs.libGL ] ++ cfg.extraPackages;
   };
 
   driversEnv32 = pkgs.buildEnv {
     name = "graphics-drivers-32bit";
-    paths = [ cfg.package32 ] ++ cfg.extraPackages32;
+    paths = [ cfg.package32 pkgs.libGL ] ++ cfg.extraPackages32;
   };
 in
 {

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -22589,7 +22589,7 @@ with pkgs;
     else if stdenv.hostPlatform.isDarwin then
       darwin.apple_sdk.frameworks.OpenGL
     else
-      libglvnd;
+      libglcapsule;
 
   # On macOS, we use the OpenGL framework. Packages that use libGLX on
   # macOS may need to depend on mesa_glu directly if this doesn’t work.
@@ -22600,11 +22600,7 @@ with pkgs;
       mesa_glu;
 
   # libglvnd does not work (yet?) on macOS.
-  libGLX =
-    if stdenv.hostPlatform.isDarwin then
-      mesa
-    else
-      libglvnd;
+  libGLX = libglcapsule;
 
   # On macOS, we use the GLUT framework. Packages that use libGLX on
   # macOS may need to depend on freeglut directly if this doesn’t work.