Merge pull request #257 from brianmcgillion/fix-driver

Fix driver
anduril · Jan 4, 2025 · 6aa9652 · 6aa9652
2 parents 46e2222 + 4dc2542
commit 6aa9652
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 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/modules/flash-script.nix b/modules/flash-script.nix
@@ -335,6 +335,18 @@ in
           default = [ ];
           description = "A list of paths to compiled .dtbo files to include with the UEFI image while flashing. These overlays are applied by UEFI at runtime";
         };
+
+        preFlashCommands = mkOption {
+          type = types.lines;
+          default = "";
+          description = "Additional commands to be added to the flash script while it is being constructed.";
+        };
+
+        postFlashCommands = mkOption {
+          type = types.lines;
+          default = "";
+          description = "Additional commands to be added to the flash script while it is being constructed.";
+        };
       };
 
       flashScript = mkOption {

diff --git a/overlay-with-config.nix b/overlay-with-config.nix
@@ -107,7 +107,7 @@ final: prev: (
       mkFlashScript = flash-tools: args: import ./device-pkgs/flash-script.nix ({
         inherit lib flash-tools;
         inherit (cfg.firmware) eksFile;
-        inherit (cfg.flashScriptOverrides) flashArgs partitionTemplate;
+        inherit (cfg.flashScriptOverrides) flashArgs partitionTemplate preFlashCommands postFlashCommands;
         inherit (finalJetpack) tosImage socType uefi-firmware;
 
         additionalDtbOverlays = args.additionalDtbOverlays or cfg.flashScriptOverrides.additionalDtbOverlays;

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