Continue the cleanup of addOpenGLRunpath

This is a follow on to the patch 6d30a91 which uses the new package name and also the new module option names so that it is aligned with mainline. Signed-off-by: Brian McGillion <[email protected]>
anduril · Dec 19, 2024 · f3c691d · f3c691d
1 parent bc47712
commit f3c691d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/modules/default.nix b/modules/default.nix
@@ -221,8 +221,8 @@ in
 
     hardware.deviceTree.enable = true;
 
-    hardware.opengl.package = pkgs.nvidia-jetpack.l4t-3d-core;
-    hardware.opengl.extraPackages =
+    hardware.graphics.package = pkgs.nvidia-jetpack.l4t-3d-core;
+    hardware.graphics.extraPackages =
       with pkgs.nvidia-jetpack;
       # l4t-core provides - among others - libnvrm_gpu.so and libnvrm_mem.so.
       # The l4t-core/lib directory is directly set in the DT_RUNPATH of
@@ -364,6 +364,7 @@ in
     };
 
     # Used by libEGL_nvidia.so.0
-    environment.etc."egl/egl_external_platform.d".source = "${pkgs.addOpenGLRunpath.driverLink}/share/egl/egl_external_platform.d/";
+    environment.etc."egl/egl_external_platform.d".source =
+      "${pkgs.addDriverRunpath.driverLink}/share/egl/egl_external_platform.d/";
   };
 }
diff --git a/pkgs/l4t/default.nix b/pkgs/l4t/default.nix
@@ -1,11 +1,9 @@
 { stdenv
 , stdenvNoCC
 , buildPackages
-, addOpenGLRunpath
 , lib
 , fetchurl
 , fetchpatch
-, fetchgit
 , autoPatchelfHook
 , dpkg
 , expat