From 1b640cc0e4468628d180f7911efae0ba7b3c8580 Mon Sep 17 00:00:00 2001
From: j-brn <me@jbrn.eu>
Date: Tue, 30 Jul 2024 22:16:37 +0200
Subject: [PATCH] looking-glass-client: replace patch file with fetchpatch

---
 ...e-X11-config-directives-to-displayse.patch | 57 -------------------
 .../looking-glass-client/default.nix          |  7 ++-
 2 files changed, 6 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch

diff --git a/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch b/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch
deleted file mode 100644
index b044fb47c2e1..000000000000
--- a/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Geoffrey McRae <geoff@hostfission.com>
-Date: Wed, 13 Mar 2024 11:17:25 +1100
-Subject: [PATCH] [client] cmake: move X11 config directives to
- `displayservers`
-
----
- client/CMakeLists.txt                | 7 -------
- client/displayservers/CMakeLists.txt | 7 +++++++
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git client/CMakeLists.txt client/CMakeLists.txt
-index 3755adcf..eeeb3eb0 100644
---- client/CMakeLists.txt
-+++ client/CMakeLists.txt
-@@ -42,19 +42,12 @@ add_feature_info(ENABLE_ASAN ENABLE_ASAN "AddressSanitizer support.")
- option(ENABLE_UBSAN "Build with UndefinedBehaviorSanitizer" OFF)
- add_feature_info(ENABLE_UBSAN ENABLE_UBSAN "UndefinedBehaviorSanitizer support.")
-
--option(ENABLE_X11 "Build with X11 support" ON)
--add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.")
--
- option(ENABLE_PIPEWIRE "Build with PipeWire audio output support" ON)
- add_feature_info(ENABLE_PIPEWIRE ENABLE_PIPEWIRE "PipeWire audio support.")
-
- option(ENABLE_PULSEAUDIO "Build with PulseAudio audio output support" ON)
- add_feature_info(ENABLE_PULSEAUDIO ENABLE_PULSEAUDIO "PulseAudio audio support.")
-
--if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND)
--  message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on")
--endif()
--
- add_compile_options(
-   "-Wall"
-   "-Wextra"
-diff --git client/displayservers/CMakeLists.txt client/displayservers/CMakeLists.txt
-index 5b5f827a..e7c4b25a 100644
---- client/displayservers/CMakeLists.txt
-+++ client/displayservers/CMakeLists.txt
-@@ -18,9 +18,16 @@ function(add_displayserver name)
-   add_subdirectory(${name})
- endfunction()
-
-+option(ENABLE_X11 "Build with X11 support" ON)
-+add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.")
-+
- option(ENABLE_WAYLAND "Build with Wayland support" ON)
- add_feature_info(ENABLE_WAYLAND ENABLE_WAYLAND "Wayland support.")
-
-+if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND)
-+  message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on")
-+endif()
-+
- # Add/remove displayservers here!
- if (ENABLE_WAYLAND)
-   add_displayserver(Wayland)
---
-2.43.1
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
index 62e65aec3ad8..5c5976fc493b 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , lib
+, fetchpatch
 , fetchFromGitHub
 , makeDesktopItem
 , pkg-config
@@ -61,7 +62,11 @@ stdenv.mkDerivation rec {
 
   patches = [
     # Fix failing cmake assertion when disabling X11 whithout explicitly enabling Wayland.
-    ./0001-client-cmake-move-X11-config-directives-to-displayse.patch
+    (fetchpatch {
+      url = "https://github.com/gnif/LookingGlass/commit/20972cfd9b940fddf9e7f3d2887a271d16398979.patch";
+      hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU=";
+      stripLen = 1;
+    })
   ];
 
   nativeBuildInputs = [ cmake pkg-config ];