xss-lock: replace postPatch with proper patch file
Replaces the postPatch workaround from #449882 with a proper patch file. The patch approach is better because when the fix is merged upstream and we update the version, the patch will fail to apply, giving us a clear signal to remove it. With postPatch, the substitution would continue to work silently even after upstream fixes it, causing us to carry unnecessary delta forever. Patches CMakeLists.txt to require CMake 3.10 instead of 2.8. CMake 4 doesn't support versions older than 3.5, and versions between 3.5-3.10 are deprecated. Upstream PR: https://github.com/xdbob/xss-lock/pull/3 Fixes: #450274 Signed-off-by: Dave Walker <dave@daviey.com>
This commit is contained in:
33
pkgs/by-name/xs/xss-lock/cmake-3.10.patch
Normal file
33
pkgs/by-name/xs/xss-lock/cmake-3.10.patch
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
From be4ef8588a97235330b2b27f097e2c9f941f3c31 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dave Walker <dave@daviey.com>
|
||||||
|
Date: Thu, 9 Oct 2025 14:17:58 +0100
|
||||||
|
Subject: [PATCH] Update CMake minimum required version to 3.10
|
||||||
|
|
||||||
|
CMake 4 removed compatibility with CMake versions < 3.5, and versions
|
||||||
|
between 3.5-3.10 are deprecated.
|
||||||
|
|
||||||
|
This change updates the minimum required version to 3.10 to ensure
|
||||||
|
compatibility with modern CMake versions including CMake 4.x.
|
||||||
|
|
||||||
|
This issue is affecting NixOS users (see
|
||||||
|
https://github.com/NixOS/nixpkgs/issues/450274) and will likely impact
|
||||||
|
other distributions as they upgrade to CMake 4.x.
|
||||||
|
|
||||||
|
Upstream PR: https://github.com/xdbob/xss-lock/pull/3
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index b1e96a4..9c6bcf0 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-cmake_minimum_required(VERSION 2.8)
|
||||||
|
+cmake_minimum_required(VERSION 3.10)
|
||||||
|
project(xss-lock C)
|
||||||
|
set(PROJECT_VERSION 0.3.0)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.51.0
|
||||||
|
|
||||||
@@ -24,6 +24,12 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "040nqgfh564frvqkrkmak3x3h0yadz6kzk81jkfvd9vd20a9drh7";
|
sha256 = "040nqgfh564frvqkrkmak3x3h0yadz6kzk81jkfvd9vd20a9drh7";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Update CMake minimum required version for CMake 4 compatibility
|
||||||
|
# https://github.com/xdbob/xss-lock/pull/3
|
||||||
|
./cmake-3.10.patch
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkg-config
|
pkg-config
|
||||||
@@ -37,13 +43,6 @@ stdenv.mkDerivation {
|
|||||||
xcbutil
|
xcbutil
|
||||||
];
|
];
|
||||||
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/445447
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace CMakeLists.txt --replace-fail \
|
|
||||||
"cmake_minimum_required(VERSION 2.8)" \
|
|
||||||
"cmake_minimum_required(VERSION 3.10)"
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests) xss-lock; };
|
passthru.tests = { inherit (nixosTests) xss-lock; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|||||||
Reference in New Issue
Block a user