Merge pull request #209 from nix-community/pkgs/opencomposite-hand-fi…

…xes/init
nix-community · Sep 6, 2024 · 2748780 · 2748780
2 parents af821bf + 5767396
commit 2748780
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 1 deletion.
diff --git a/_sources/generated.json b/_sources/generated.json
@@ -63,6 +63,25 @@
         },
         "version": "b4bef2a6deb3c8526c211c6db169efedeb13a887"
     },
+    "opencomposite-hand-fixes": {
+        "cargoLocks": null,
+        "date": "2024-09-06",
+        "extract": null,
+        "name": "opencomposite-hand-fixes",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": true,
+            "leaveDotGit": false,
+            "name": null,
+            "rev": "3f950d57a071a8c1417147c63c1cab1af03bcb86",
+            "sha256": "sha256-ZcDORAweDd3rcV5IQ8nXxLqcyJZf4tcm6jhVth0ali0=",
+            "type": "git",
+            "url": "https://gitlab.com/znixian/OpenOVR.git"
+        },
+        "version": "3f950d57a071a8c1417147c63c1cab1af03bcb86"
+    },
     "wlx-overlay-s": {
         "cargoLocks": {
             "Cargo.lock": [

diff --git a/_sources/generated.nix b/_sources/generated.nix
@@ -46,6 +46,19 @@
     };
     date = "2024-08-30";
   };
+  opencomposite-hand-fixes = {
+    pname = "opencomposite-hand-fixes";
+    version = "3f950d57a071a8c1417147c63c1cab1af03bcb86";
+    src = fetchgit {
+      url = "https://gitlab.com/znixian/OpenOVR.git";
+      rev = "3f950d57a071a8c1417147c63c1cab1af03bcb86";
+      fetchSubmodules = true;
+      deepClone = false;
+      leaveDotGit = false;
+      sha256 = "sha256-ZcDORAweDd3rcV5IQ8nXxLqcyJZf4tcm6jhVth0ali0=";
+    };
+    date = "2024-09-06";
+  };
   wlx-overlay-s = {
     pname = "wlx-overlay-s";
     version = "4f38d1ad444f857a836b6288a84a8b47e59a7714";

diff --git a/nvfetcher.toml b/nvfetcher.toml
@@ -11,6 +11,12 @@ src.git = "https://gitlab.com/znixian/OpenOVR.git"
 fetch.git = "https://gitlab.com/znixian/OpenOVR.git"
 git.fetchSubmodules = true
 
+[opencomposite-hand-fixes]
+src.git = "https://gitlab.com/znixian/OpenOVR.git"
+src.branch = "hand-fixes"
+fetch.git = "https://gitlab.com/znixian/OpenOVR.git"
+git.fetchSubmodules = true
+
 [index_camera_passthrough]
 src.git = "https://github.com/yshui/index_camera_passthrough.git"
 fetch.git = "https://github.com/yshui/index_camera_passthrough.git"

diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -29,6 +29,7 @@ in
       # Overridden packages
       (import ./overrides/monado.nix)
       (import ./overrides/opencomposite.nix)
+      (import ./overrides/opencomposite-hand-fixes.nix)
       (import ./overrides/opencomposite-vendored.nix)
       (import ./overrides/wlx-overlay-s.nix)
     ];

diff --git a/pkgs/overrides/opencomposite-hand-fixes.nix b/pkgs/overrides/opencomposite-hand-fixes.nix
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2024 Sefa Eyeoglu <contact@scrumplex.net>
+#
+# SPDX-License-Identifier: MIT
+
+final: prev: {
+  opencomposite-hand-fixes = prev.opencomposite.overrideAttrs (prevAttrs: {
+    inherit (final.xrSources.opencomposite-hand-fixes) pname version src;
+
+    # remove glm and openxr-loader from buildInputs
+    buildInputs = final.lib.subtractLists (with final; [
+      glm
+      openxr-loader
+    ]) prevAttrs.buildInputs;
+
+    cmakeFlags = prevAttrs.cmakeFlags ++ [
+      (final.lib.cmakeBool "USE_SYSTEM_OPENXR" true)
+      (final.lib.cmakeBool "USE_SYSTEM_GLM" true)
+    ];
+  });
+}
diff --git a/pkgs/overrides/opencomposite-vendored.nix b/pkgs/overrides/opencomposite-vendored.nix
@@ -7,7 +7,10 @@ final: prev: {
     inherit (final.xrSources.opencomposite) pname version src;
 
     # remove glm and openxr-loader from buildInputs
-    buildInputs = final.lib.subtractLists (with final; [glm openxr-loader]) prevAttrs.buildInputs;
+    buildInputs = final.lib.subtractLists (with final; [
+      glm
+      openxr-loader
+    ]) prevAttrs.buildInputs;
 
     cmakeFlags = prevAttrs.cmakeFlags ++ [
       (final.lib.cmakeBool "USE_SYSTEM_OPENXR" true)