From 9a19283b0f9f9393b73dea644534f81b6c2d30ae Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 29 Sep 2025 09:31:38 +0200
Subject: [PATCH 1/5] libuecc: fix build with cmake 4

---
 pkgs/by-name/li/libuecc/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/li/libuecc/package.nix b/pkgs/by-name/li/libuecc/package.nix
index eebb0f2a01c4..becafcf39c36 100644
--- a/pkgs/by-name/li/libuecc/package.nix
+++ b/pkgs/by-name/li/libuecc/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchgit,
+  fetchpatch,
   cmake,
 }:
 
@@ -15,6 +16,14 @@ stdenv.mkDerivation rec {
     sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs";
   };
 
+  patches = [
+    # Backport CMake 4 support
+    (fetchpatch {
+      url = "https://github.com/neocturne/libuecc/commit/b3812bf5ab1777193c4b85863311c33997d141f9.patch";
+      hash = "sha256-3h+LC5JlSXNiJlEQxSQzC7+5s+nMp+ll2NQQC5HzTf0=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   meta = with lib; {

From 614ff062ae45812d46b9de8af8db8f645b4b8e2e Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 29 Sep 2025 09:34:33 +0200
Subject: [PATCH 2/5] ecdsautils: don't use pkgs

this is bad practise and probably breaks splicing
---
 pkgs/by-name/ec/ecdsautils/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ec/ecdsautils/package.nix b/pkgs/by-name/ec/ecdsautils/package.nix
index ee4560b82c0a..cd3088305ec3 100644
--- a/pkgs/by-name/ec/ecdsautils/package.nix
+++ b/pkgs/by-name/ec/ecdsautils/package.nix
@@ -1,7 +1,11 @@
 {
   lib,
   stdenv,
-  pkgs,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  doxygen,
+  libuecc,
 }:
 
 let
@@ -11,19 +15,19 @@ in
 stdenv.mkDerivation {
   inherit pname version;
 
-  src = pkgs.fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "freifunk-gluon";
     repo = "ecdsautils";
     rev = "v${version}";
     sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg=";
   };
 
-  nativeBuildInputs = with pkgs; [
+  nativeBuildInputs = [
     cmake
     pkg-config
     doxygen
   ];
-  buildInputs = with pkgs; [ libuecc ];
+  buildInputs = [ libuecc ];
 
   meta = with lib; {
     description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)";

From 64f96372d6d4cd421877040016a6ae80415264ab Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 29 Sep 2025 09:35:41 +0200
Subject: [PATCH 3/5] ecdsautils: fix build with cmake 4

---
 pkgs/by-name/ec/ecdsautils/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ec/ecdsautils/package.nix b/pkgs/by-name/ec/ecdsautils/package.nix
index cd3088305ec3..3c90fcd5c8ba 100644
--- a/pkgs/by-name/ec/ecdsautils/package.nix
+++ b/pkgs/by-name/ec/ecdsautils/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   doxygen,
@@ -22,6 +23,13 @@ stdenv.mkDerivation {
     sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/freifunk-gluon/ecdsautils/commit/19f096f9c10264f4efe4b926fe83126e85642cba.patch";
+      hash = "sha256-oJv47NckFHFONPcG3WfHwgaHRqrz2eWXzbr5SQr+kX4=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 352e6934cc949f6e98c5c79cf6091d5d1516ef52 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 29 Sep 2025 10:29:07 +0200
Subject: [PATCH 4/5] lensfun: fix build with cmake 4

---
 pkgs/by-name/le/lensfun/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/le/lensfun/package.nix b/pkgs/by-name/le/lensfun/package.nix
index c6d058c55b67..d59644ce0c73 100644
--- a/pkgs/by-name/le/lensfun/package.nix
+++ b/pkgs/by-name/le/lensfun/package.nix
@@ -45,6 +45,16 @@ stdenv.mkDerivation {
     mkdir -p data/db
     tar xvf $TMPDIR/db/version_1.tar -C data/db
     date +%s > data/db/timestamp.txt
+  ''
+  # Backport CMake 4 support
+  # This is already on master, but not yet in a stable release:
+  # https://github.com/lensfun/lensfun/issues/2520
+  # https://github.com/lensfun/lensfun/commit/011de2e85813ff496a85404b30891352555de077
+  + ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR )' \
+        'CMAKE_MINIMUM_REQUIRED(VERSION 3.12 FATAL_ERROR)'
   '';
 
   nativeBuildInputs = [

From 826c0380c695d97cbb89e43b0247281ca2108fe0 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 29 Sep 2025 10:38:50 +0200
Subject: [PATCH 5/5] sqlitebrowser: fix build with cmake 4

---
 pkgs/by-name/sq/sqlitebrowser/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/sq/sqlitebrowser/package.nix b/pkgs/by-name/sq/sqlitebrowser/package.nix
index 4318bc279d81..d11c3b469bd2 100644
--- a/pkgs/by-name/sq/sqlitebrowser/package.nix
+++ b/pkgs/by-name/sq/sqlitebrowser/package.nix
@@ -28,6 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail '"Unknown"' '"${finalAttrs.src.rev}"'
+  ''
+  # Fix build with CMake 4
+  # Will be part of the Qt6 port
+  # Note: The vendored version of qhexedit is incompatible with our qhexedit2: https://github.com/sqlitebrowser/sqlitebrowser/issues/1808
+  + ''
+    substituteInPlace libs/qhexedit/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 2.8.12.2)' 'cmake_minimum_required(VERSION 3.16)'
   '';
 
   buildInputs = [