From f0a14f597826430dbc1c08c7cf656500f10d774a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 13 Oct 2025 11:39:17 +0200 Subject: [PATCH] tint2: fix build with CMake4 Also fix a warning about calling 'project' before setting the minimum required version. --- pkgs/by-name/ti/tint2/fix-cmake-version.patch | 22 +++++++++++++++++++ pkgs/by-name/ti/tint2/package.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/by-name/ti/tint2/fix-cmake-version.patch diff --git a/pkgs/by-name/ti/tint2/fix-cmake-version.patch b/pkgs/by-name/ti/tint2/fix-cmake-version.patch new file mode 100644 index 000000000000..f43ac804d7e9 --- /dev/null +++ b/pkgs/by-name/ti/tint2/fix-cmake-version.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 336dff9..8b8a853 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ ++cmake_minimum_required( VERSION 3.10 ) + project( tint2 ) +-cmake_minimum_required( VERSION 2.8.5 ) + + option( ENABLE_BATTERY "Enable battery status plugin" ON ) + option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+3 theme configurator for tint2" ON ) +diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt +index 747b9ac..cbe13bb 100644 +--- a/src/tint2conf/CMakeLists.txt ++++ b/src/tint2conf/CMakeLists.txt +@@ -1,5 +1,5 @@ ++cmake_minimum_required(VERSION 3.10) + project(tint2conf) +-cmake_minimum_required(VERSION 2.6) + + include( FindPkgConfig ) + pkg_check_modules( X11_T2C REQUIRED x11 xcomposite xdamage xinerama xrender xrandr>=1.3 ) diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix index b00d34b131e8..c5271e49ffa3 100644 --- a/pkgs/by-name/ti/tint2/package.nix +++ b/pkgs/by-name/ti/tint2/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/nick87720z/tint2/uploads/7de4501a4fa4fffa5ba8bb0fa3d19f78/glib.patch"; hash = "sha256-K547KYlRkVl1s2THi3ZCRuM447EFJwTqUEBjKQnV8Sc="; }) + ./fix-cmake-version.patch ]; # Fix build with gcc14