wivrn: 26.2.3 -> 26.6.1 (#531078)

pkgs/by-name/wi/wivrn/package.nix

@@ -11,8 +11,6 @@
   boost,
   cli11,
   cmake,
-  cudaPackages ? { },
-  cudaSupport ? config.cudaSupport,
   eigen,
   ffmpeg,
   freetype,
@@ -21,6 +19,7 @@
   glm,
   glslang,
   harfbuzz,
+  hexdump,
   kdePackages,
   libarchive,
   libdrm,
@@ -36,7 +35,6 @@
   nlohmann_json,
   opencomposite,
   openxr-loader,
-  ovrCompatSearchPaths ? "${xrizer}/lib/xrizer:${opencomposite}/lib/opencomposite",
   pipewire,
   pkg-config,
   python3,
@@ -49,19 +47,22 @@
   vulkan-loader,
   x264,
   xrizer,
+  cudaSupport ? config.cudaSupport,
+  # WiVRn defaults to the first path but the others can be manually selected
+  ovrCompatSearchPaths ? "${xrizer}/lib/xrizer:${opencomposite}/lib/opencomposite",
   # Only build the OpenXR client library. Useful for building the client library for a different architecture,
   # e.g. 32-bit library while running 64-bit service on host, so 32-bit apps can connect to the runtime
   clientLibOnly ? false,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wivrn";
-  version = "26.2.3";
+  version = "26.6.1";
 
   src = fetchFromGitHub {
     owner = "wivrn";
     repo = "wivrn";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-pU7FYPp5wa0MK0ut/BfFlnUai8yMcylpWC0CoAExAio=";
+    hash = "sha256-eXU7hYLYchAb6AbCyINfTmOp0NdxK35Kg9tcid2ucg4=";
   };
 
   monado = applyPatches {
@@ -69,8 +70,8 @@ stdenv.mkDerivation (finalAttrs: {
       domain = "gitlab.freedesktop.org";
       owner = "monado";
       repo = "monado";
-      rev = "723652b545a79609f9f04cb89fcbf807d9d6451a";
-      hash = "sha256-wGqvTI/X22apc8XCN3GCGQClHfBW5xk73mZnwWvHtyI=";
+      rev = "1b526bb3a0ff326ecd05af4c2c541407f53c6d4b";
+      hash = "sha256-SzuCQ1uX15vFGwGt3gswlVF2Su8sIND4R3tsTJ4T1LY=";
     };
 
     postPatch = ''
@@ -97,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     git
     glib
     glslang
+    hexdump
     librsvg
     pkg-config
     python3
@@ -133,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
     kdePackages.ki18n
     kdePackages.kiconthemes
     kdePackages.kirigami
+    kdePackages.kirigami-addons
     kdePackages.qcoro
     kdePackages.qqc2-desktop-style
     libarchive
@@ -147,9 +150,6 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtsvg
     qt6.qttools
     x264
-  ]
-  ++ lib.optionals (cudaSupport && !clientLibOnly) [
-    cudaPackages.cudatoolkit
   ];
 
   cmakeFlags = [
@@ -162,6 +162,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute")
     (lib.cmakeBool "WIVRN_OPENXR_MANIFEST_ABI" clientLibOnly)
     (lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}")
+    (lib.cmakeFeature "GIT_COMMIT" "v${finalAttrs.version}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}")
   ]
   ++ lib.optionals (!clientLibOnly) [
@@ -173,9 +174,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true)
     (lib.cmakeBool "WIVRN_FEATURE_STEAMVR_LIGHTHOUSE" true)
     (lib.cmakeFeature "OVR_COMPAT_SEARCH_PATH" ovrCompatSearchPaths)
-  ]
-  ++ lib.optionals (cudaSupport && !clientLibOnly) [
-    (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}")
   ];
 
   dontWrapQtApps = true;