From 5e37eb810482d29b9d1dba1040ad1df2db5d9dd8 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 6 Oct 2024 19:39:01 +0200 Subject: [PATCH] opencomposite-hand-fixes: drop Signed-off-by: Sefa Eyeoglu --- _sources/generated.json | 19 ------------------- _sources/generated.nix | 13 ------------- nvfetcher.toml | 6 ------ pkgs/default.nix | 1 - pkgs/overrides/opencomposite-hand-fixes.nix | 20 -------------------- 5 files changed, 59 deletions(-) delete mode 100644 pkgs/overrides/opencomposite-hand-fixes.nix diff --git a/_sources/generated.json b/_sources/generated.json index 94a6e1b..9acf45d 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -63,25 +63,6 @@ }, "version": "9d2c9d99583fdbbfe1644206da20dab5f4750dfe" }, - "opencomposite-hand-fixes": { - "cargoLocks": null, - "date": "2024-09-11", - "extract": null, - "name": "opencomposite-hand-fixes", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": true, - "leaveDotGit": false, - "name": null, - "rev": "042bc49e73dd4612e06d881d90dc0ab6366b895b", - "sha256": "sha256-Ix1bMyjzOuloBPlLHCBgYSHgdTBLSnqlQA/1D+xCKkk=", - "type": "git", - "url": "https://gitlab.com/znixian/OpenOVR.git" - }, - "version": "042bc49e73dd4612e06d881d90dc0ab6366b895b" - }, "wlx-overlay-s": { "cargoLocks": { "Cargo.lock": [ diff --git a/_sources/generated.nix b/_sources/generated.nix index e2c6fd9..1fb0be8 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -46,19 +46,6 @@ }; date = "2024-10-04"; }; - opencomposite-hand-fixes = { - pname = "opencomposite-hand-fixes"; - version = "042bc49e73dd4612e06d881d90dc0ab6366b895b"; - src = fetchgit { - url = "https://gitlab.com/znixian/OpenOVR.git"; - rev = "042bc49e73dd4612e06d881d90dc0ab6366b895b"; - fetchSubmodules = true; - deepClone = false; - leaveDotGit = false; - sha256 = "sha256-Ix1bMyjzOuloBPlLHCBgYSHgdTBLSnqlQA/1D+xCKkk="; - }; - date = "2024-09-11"; - }; wlx-overlay-s = { pname = "wlx-overlay-s"; version = "64b326330933a1b27efcb0d546468d3acad4ec56"; diff --git a/nvfetcher.toml b/nvfetcher.toml index 66b8b7d..bd14c66 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -11,12 +11,6 @@ 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 index db95da2..4bc7a66 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -29,7 +29,6 @@ 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 deleted file mode 100644 index 55cb569..0000000 --- a/pkgs/overrides/opencomposite-hand-fixes.nix +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-FileCopyrightText: 2024 Sefa Eyeoglu -# -# 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) - ]; - }); -}