From 0e94b069eea70f3ff2ea36b8b04788a0f2ed6cb5 Mon Sep 17 00:00:00 2001 From: winston Date: Fri, 6 Feb 2026 13:59:08 +0100 Subject: [PATCH 1/2] opentrack: 2026.1.0-unstable-2026-01-03 -> 2026.1.0-unstable-2026-01-24 Also adds fusion as a dependency introduced in opentrack/opentrack@f24a58e --- pkgs/by-name/op/opentrack/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix index f66c08ec2a67..4de60523bedb 100644 --- a/pkgs/by-name/op/opentrack/package.nix +++ b/pkgs/by-name/op/opentrack/package.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "opentrack"; - version = "2026.1.0-unstable-2026-01-03"; + version = "2026.1.0-unstable-2026-01-24"; src = fetchFromGitHub { owner = "opentrack"; repo = "opentrack"; - rev = "0779d3ce9da19d46919e909d0a1a252d67122db9"; - hash = "sha256-n7XCNNXgfwU4q27Q7ss9tgc2Z/tmzcRxUP4chwpPN38="; + rev = "2d3ab7a61d2514ce51c9656908d33465a788763e"; + hash = "sha256-+Xb3zlybQrrc1AiTdYXxDhuFNN7g7u7ryM7da2EJpaY="; }; aruco = callPackage ./aruco.nix { }; @@ -40,6 +40,13 @@ stdenv.mkDerivation (finalAttrs: { meta.license = lib.licenses.free; }; + fusion = fetchFromGitHub { + owner = "xioTechnologies"; + repo = "Fusion"; + tag = "v1.2.11"; + hash = "sha256-9bqqP+6kfdRWIRnnP+R0lXSQs6OmZoNlbCjqiJeJjpk="; + }; + patches = [ # calls `app.setDesktopFileName("opentrack");` - distros that don't wrap the binary apparently don't need this. ./desktop-filename.patch @@ -69,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_AHRSFUSION" "${finalAttrs.fusion}") (lib.cmakeFeature "OPENTRACK_COMMIT" "opentrack-${finalAttrs.version}") (lib.cmakeBool "SDK_WINE" withWine) (lib.cmakeFeature "SDK_ARUCO_LIBPATH" "${finalAttrs.aruco}/lib/libaruco.a") From 2c2cb1f49dc1398cc145a7d2212dad2b641c1497 Mon Sep 17 00:00:00 2001 From: winston Date: Fri, 6 Feb 2026 14:02:20 +0100 Subject: [PATCH 2/2] opentrack: provide v4l-utils on `PATH` Used to open webcam camera settings: https://github.com/opentrack/opentrack/blob/2d3ab7a61d2514ce51c9656908d33465a788763e/video-opencv/video-property-page.cpp#L150-L160 --- pkgs/by-name/op/opentrack/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix index 4de60523bedb..57cb9562ff9a 100644 --- a/pkgs/by-name/op/opentrack/package.nix +++ b/pkgs/by-name/op/opentrack/package.nix @@ -18,6 +18,7 @@ wineWow64Packages, onnxruntime, nix-update-script, + v4l-utils, withWine ? stdenv.targetPlatform.isx86_64, }: stdenv.mkDerivation (finalAttrs: { @@ -90,7 +91,8 @@ stdenv.mkDerivation (finalAttrs: { # manually wrap just the main binary dontWrapQtApps = true; preFixup = '' - wrapQtApp $out/bin/opentrack + wrapQtApp $out/bin/opentrack \ + --prefix PATH : ${lib.makeBinPath [ v4l-utils ]} ''; desktopItems = [