From d93e2eb2f0824dc3900aee695e689fa6c775167f Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Fri, 27 Dec 2024 02:46:22 +0800
Subject: [PATCH] deskflow: 1.17.2 -> 1.18.0

---
 pkgs/by-name/de/deskflow/package.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix
index 9fdbfed8b441b..116a3fff88459 100644
--- a/pkgs/by-name/de/deskflow/package.nix
+++ b/pkgs/by-name/de/deskflow/package.nix
@@ -32,20 +32,22 @@
 }:
 stdenv.mkDerivation rec {
   pname = "deskflow";
-  version = "1.17.2";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "deskflow";
     repo = "deskflow";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-CHlvL/MC9clFrMxlfIXaCFoTkcLS7QsYK7MXMFW0188=";
+    tag = "v${version}";
+    hash = "sha256-FdpDaJ+pphy2+8prlKst0DjmdbcZOmNp+lKN5xdnvC8=";
   };
 
   postPatch = ''
     substituteInPlace src/lib/deskflow/unix/AppUtilUnix.cpp \
       --replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard_config}/share/X11/xkb/rules/evdev.xml"
     substituteInPlace src/lib/gui/tls/TlsCertificate.cpp \
-      --replace-fail "\"openssl\"" "\"${lib.getBin openssl}/bin/openssl\""
+      --replace-fail '"openssl"' '"${lib.getBin openssl}/bin/openssl"'
+    substituteInPlace deploy/linux/deploy.cmake \
+      --replace-fail 'message(FATAL_ERROR "Unable to read file /etc/os-release")' 'set(RELEASE_FILE_CONTENTS "")'
   '';
 
   nativeBuildInputs = [
@@ -117,9 +119,6 @@ stdenv.mkDerivation rec {
     knownVulnerabilities = [
       "CVE-2021-42072"
       "CVE-2021-42073"
-      "CVE-2021-42074"
-      "CVE-2021-42075"
-      "CVE-2021-42076"
     ];
   };
 }