diff --git a/daemon/flake.nix b/daemon/flake.nix index a5dfb94..cad3453 100644 --- 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 index fc18f14..db7e986 100644 --- 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 index 7ac57c7..7064932 100644 --- 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)