From 95514bf7dd1ba0887cc9abb8b48d1fe141f676cd Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Sun, 20 Oct 2024 16:35:33 -0400
Subject: [PATCH] fix wivrn build

---
 etcnixos/flake.lock     |  8 ++++----
 etcnixos/flake.nix      |  2 +-
 etcnixos/vr.nix         | 12 +++++++++++-
 home-manager/flake.lock |  6 +++---
 home-manager/gui.nix    |  2 +-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock
index 59082af..4e9c4c0 100644
--- a/etcnixos/flake.lock
+++ b/etcnixos/flake.lock
@@ -392,16 +392,16 @@
     },
     "wivrn": {
       "locked": {
-        "lastModified": 1729405003,
-        "narHash": "sha256-V9ZdbZ2iFVsN2AF/aJmSiRDp9rU5HYeQX+1NBYcKJzQ=",
+        "lastModified": 1729447101,
+        "narHash": "sha256-+amYWj/GpgYyYU1R2TTojPAXMNbCr93DVgVGcdIXgaQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "414c84c95aab19cb7dc603f0139d6dea2bc9f053",
+        "rev": "1c41a27405aa44b94ba10c2002c20209e4911ff5",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "pull/349910/head",
+        "ref": "pull/350069/head",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix
index 0fded00..d4cfe36 100644
--- a/etcnixos/flake.nix
+++ b/etcnixos/flake.nix
@@ -12,7 +12,7 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-    wivrn.url = "github:NixOS/nixpkgs/pull/349910/head";
+    wivrn.url = "github:NixOS/nixpkgs/pull/350069/head";
 
     chaotic = {
       url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix
index 069d009..129efa5 100644
--- a/etcnixos/vr.nix
+++ b/etcnixos/vr.nix
@@ -5,7 +5,17 @@
     openFirewall = true;
 
     # Use my fork for WiVRn 0.20
-    package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn;
+    package = (
+      inputs.wivrn.legacyPackages.${pkgs.system}.wivrn.overrideAttrs (old: {
+        patches = [
+          (pkgs.fetchurl {
+            url = "https://github.com/WiVRn/WiVRn/commit/be95ec84b56794ca8d97bb8b21dec6443ba57bc4.diff";
+            sha256 = "1tNQ57XIki0bomNG5xg+/4YbgKanrM5LOQvvCmZQFhw=";
+          })
+        ];
+
+      })
+    );
 
     # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications
     # will automatically read this and work with wivrn
diff --git a/home-manager/flake.lock b/home-manager/flake.lock
index ea6e216..2eee3e7 100644
--- a/home-manager/flake.lock
+++ b/home-manager/flake.lock
@@ -146,11 +146,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729441716,
-        "narHash": "sha256-Fxgt9QFm2bxDoZgUiDlyJZo+554IQio3Lm8bjlQ8Hn4=",
+        "lastModified": 1729443752,
+        "narHash": "sha256-QKt5nqzfFoGp2jQyMvZwMp7zPXppZM517DzMCk44gbA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "35f9ccf13b3e213b7d19984023aa75e283b3bced",
+        "rev": "930dee9882d3a3e89b9cdc76cb9c2ab3fb4b52fa",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/gui.nix b/home-manager/gui.nix
index b298277..a26ef35 100644
--- a/home-manager/gui.nix
+++ b/home-manager/gui.nix
@@ -92,7 +92,7 @@
 
     inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser
 
-    freecad-wayland
+    # freecad-wayland
   ];
 
   # make chromium-based stuff use wayland