Don't build OpenCV contrib

strykeforce · Feb 3, 2024 · 826bc71 · 826bc71
1 parent 84bd5dd
commit 826bc71
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/daemon/flake.nix b/daemon/flake.nix
@@ -66,7 +66,7 @@
 
                 };
 
-            dockerImage = pkgs.dockerTools.streamLayeredImage {
+            dockerImage = pkgs.dockerTools.buildLayeredImage {
               name = "j3ff/deadeye-daemon";
               tag = "latest";
 

diff --git a/daemon/justfile b/daemon/justfile
@@ -8,7 +8,7 @@ VERSION := `git rev-parse --short HEAD`
 
 docker:
   nix build .#dockerImage
-  ./result | docker load
+  docker load < result
   docker tag {{ IMAGE }}:latest {{ IMAGE }}:{{VERSION}}
 
 run: docker

diff --git a/daemon/nix/wpilib.nix b/daemon/nix/wpilib.nix
@@ -7,6 +7,7 @@
 let
   opencv-gstreamer = opencv.overrideAttrs {
     enableGStreamer = true;
+    enableContrib = false;
   };
 
   wpilibFlag = name: enabled: "-DWITH_${name}=${if enabled then "ON" else "OFF"}";
@@ -31,7 +32,6 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ opencv-gstreamer ];
 
   cmakeFlags = [
-    # (wpilibFlag "FLAT_INSTALL" true)
     (wpilibFlag "JAVA" false)
     (wpilibFlag "CSCORE" true)
     (wpilibFlag "WPIMATH" false)