Merge pull request #261 from danielfullmer/opencv4

Use opencv4 for multimedia-samples
anduril · Jan 4, 2025 · b0ed9de · b0ed9de
2 parents 6aa9652 + b8a531e
commit b0ed9de
Showing 1 changed file with 5 additions and 3 deletions.
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 = [