From 1aa6bf6f60d1f3f06fe8791ead84b4f9a8e427b6 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 17 May 2025 12:40:06 +0200 Subject: [PATCH 1/2] wivrn: patch monado to work with vulkan-headers >= 1.4.310 --- pkgs/by-name/wi/wivrn/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index 178aed6fcbea..3c9288d25694 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -4,6 +4,7 @@ stdenv, fetchFromGitHub, fetchFromGitLab, + fetchpatch2, applyPatches, autoAddDriverRunpath, avahi, @@ -71,6 +72,10 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./force-enable-steamvr_lh.patch + (fetchpatch2 { + url = "https://gitlab.freedesktop.org/monado/monado/-/commit/2a6932d46dad9aa957205e8a47ec2baa33041076.patch"; + hash = "sha256-CZMbGgx7mEDcjcoRJHDZ5P6BecFW8CB4fpzxQ9bpAvE="; + }) ]; postPatch = '' From c7366e9184009ce833e014e17d4955310dc47468 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Sat, 17 May 2025 12:42:19 +0200 Subject: [PATCH 2/2] wivrn: remove usages of with --- pkgs/by-name/wi/wivrn/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index 3c9288d25694..85a0bc855272 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -196,14 +196,14 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "An OpenXR streaming application to a standalone headset"; homepage = "https://github.com/WiVRn/WiVRn/"; changelog = "https://github.com/WiVRn/WiVRn/releases/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ passivelemon ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.passivelemon ]; + platforms = lib.platforms.linux; mainProgram = "wivrn-server"; - sourceProvenance = with sourceTypes; [ fromSource ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; }; })