gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tint2: fix build with CMake 4 (#451616)

Browse Source
This commit is contained in:
Matthieu Coudron
2025-10-14 10:53:29 +00:00
committed by GitHub
parent 753db82562 5816f0b2de
commit b6e47f2036
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/by-name/ti/tint2/fix-cmake-version.patch Normal file
View File

@@ -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 )

12
pkgs/by-name/ti/tint2/package.nix
View File

@@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
url = "https://gitlab.com/nick87720z/tint2/uploads/7de4501a4fa4fffa5ba8bb0fa3d19f78/glib.patch"; url = "https://gitlab.com/nick87720z/tint2/uploads/7de4501a4fa4fffa5ba8bb0fa3d19f78/glib.patch";
hash = "sha256-K547KYlRkVl1s2THi3ZCRuM447EFJwTqUEBjKQnV8Sc="; hash = "sha256-K547KYlRkVl1s2THi3ZCRuM447EFJwTqUEBjKQnV8Sc=";
}) })
# https://gitlab.com/nick87720z/tint2/-/merge_requests/4
./fix-cmake-version.patch
]; ];
# Fix build with gcc14 # Fix build with gcc14
@@ -80,6 +82,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
# Add missing dependency on libm # Add missing dependency on libm
# https://gitlab.com/nick87720z/tint2/-/merge_requests/3
substituteInPlace src/tint2conf/CMakeLists.txt \ substituteInPlace src/tint2conf/CMakeLists.txt \
--replace-fail "RSVG_LIBRARIES} )" "RSVG_LIBRARIES} m)" --replace-fail "RSVG_LIBRARIES} )" "RSVG_LIBRARIES} m)"
@@ -90,11 +93,12 @@ stdenv.mkDerivation rec {
nativeInstallCheckInputs = [ versionCheckHook ]; nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true; doInstallCheck = true;
meta = with lib; { meta = {
mainProgram = "tint2";
homepage = "https://gitlab.com/nick87720z/tint2"; homepage = "https://gitlab.com/nick87720z/tint2";
description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)";
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
platforms = platforms.linux; platforms = lib.platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ lib.maintainers.romildo ];
}; };
} }