From 12322392aaded45aafdcc2ab63b3471f951b0323 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:21:22 +0800
Subject: [PATCH] znc: 1.8.2 -> 1.9.1

---
 pkgs/applications/networking/znc/default.nix | 26 +++++++++++---------
 pkgs/applications/networking/znc/modules.nix | 13 ++++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index a178c2c455b8..d2762cdccf7a 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch2,
+  cmake,
   openssl,
   pkg-config,
   withPerl ? false,
@@ -23,22 +23,26 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "znc";
-  version = "1.8.2";
+  version = "1.9.1";
 
   src = fetchurl {
     url = "https://znc.in/releases/archive/znc-${finalAttrs.version}.tar.gz";
-    sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz";
+    hash = "sha256-6KfPgOGarVELTigur2G1a8MN+I6i4PZPrc3TA8SJTzw=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "CVE-2024-39844.patch";
-      url = "https://github.com/znc/znc/commit/8cbf8d628174ddf23da680f3f117dc54da0eb06e.patch";
-      hash = "sha256-JeKirXReiCiNDUS9XodI0oHASg2mPDvQYtV6P4L0mHM=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace znc.pc.cmake.in \
+      --replace-fail 'bindir=''${exec_prefix}/@CMAKE_INSTALL_BINDIR@' "bindir=@CMAKE_INSTALL_FULL_BINDIR@" \
+      --replace-fail 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' "libdir=@CMAKE_INSTALL_FULL_LIBDIR@" \
+      --replace-fail 'datadir=''${prefix}/@CMAKE_INSTALL_DATADIR@' "datadir=@CMAKE_INSTALL_FULL_DATADIR@" \
+      --replace-fail 'includedir=''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' "includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@" \
+      --replace-fail 'datarootdir=''${prefix}/@CMAKE_INSTALL_DATAROOTDIR@' "datarootdir=@CMAKE_INSTALL_FULL_DATAROOTDIR@"
+  '';
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
 
   buildInputs =
     [ openssl ]
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 4d7403df0050..70cea47dcae3 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -3,6 +3,10 @@
   stdenv,
   fetchFromGitHub,
   znc,
+  cmake,
+  pkg-config,
+  python3,
+  which,
 }:
 
 let
@@ -32,6 +36,15 @@ let
       // {
         inherit buildPhase installPhase;
 
+        nativeBuildInputs = [
+          python3
+          which
+          cmake
+          pkg-config
+        ];
+
+        dontUseCmakeConfigure = true;
+
         buildInputs = znc.buildInputs;
 
         passthru.module_name = module_name;