Unverified Commit f0a14f59 authored by Stefan Frijters's avatar Stefan Frijters
Browse files

tint2: fix build with CMake4 

Also fix a warning about calling 'project' before setting the minimum required version.
parent ff57446e

pkgs/by-name/ti/tint2/fix-cmake-version.patch

0 → 100644
+22 −0
Original line number Diff line number Diff line 
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 )

pkgs/by-name/ti/tint2/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -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