Merge remote-tracking branch 'public/master' into jp514

anduril · Jan 4, 2025 · 6bac358 · 6bac358
2 parents cba3038 + 561059d
commit 6bac358
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 14 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
   };
 
   outputs = { self, nixpkgs, ... }:

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

diff --git a/pkgs/samples/default.nix b/pkgs/samples/default.nix
@@ -6,7 +6,6 @@
 , autoAddDriverRunpath
 , cmake
 , opencv
-, opencv2
 , libX11
 , libdrm
 , libglvnd
@@ -312,12 +311,15 @@ let
     sourceRoot = "source/usr/src/jetson_multimedia_api";
 
     nativeBuildInputs = [ dpkg python3 ];
-    buildInputs = [ libX11 libdrm libglvnd opencv2 vulkan-headers vulkan-loader ]
+    buildInputs = [ libX11 libdrm libglvnd opencv vulkan-headers vulkan-loader ]
       ++ ([ l4t-cuda l4t-multimedia l4t-camera ])
       ++ (with cudaPackages; [ cudatoolkit tensorrt ]);
 
     # Usually provided by pkg-config, but the samples don't use it.
-    NIX_CFLAGS_COMPILE = [ "-I${lib.getDev libdrm}/include/libdrm" ];
+    NIX_CFLAGS_COMPILE = [
+      "-I${lib.getDev libdrm}/include/libdrm"
+      "-I${lib.getDev opencv}/include/opencv4"
+    ];
 
     # TODO: Unify this with headers in l4t-jetson-multimedia-api
     patches = [