From b560cfb45652bbcb29181a0053c17f5255fc851e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 4 Mar 2025 12:19:39 +0100 Subject: [PATCH 1/3] tint2: fix build Apparently this subproject was missing an explicit dependency on libm Fixes ``` > /nix/store/9g4gsby96w4cx1i338kplaap0x37apdf-binutils-2.43.1/bin/ld: CMakeFiles/tint2conf.dir/__/util/common.c.o: undefined reference to symbol 'log10@@GLIBC_2.2.5' > /nix/store/9g4gsby96w4cx1i338kplaap0x37apdf-binutils-2.43.1/bin/ld: /nix/store/6q2mknq81cyscjmkv72fpcsvan56qhmg-glibc-2.40-66/lib/libm.so.6: error adding symbols: DSO missing from command line > collect2: error: ld returned 1 exit status ``` --- pkgs/by-name/ti/tint2/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix index 1c55cb009fe6..af215d59c430 100644 --- a/pkgs/by-name/ti/tint2/package.nix +++ b/pkgs/by-name/ti/tint2/package.nix @@ -78,6 +78,10 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # Add missing dependency on libm + substituteInPlace src/tint2conf/CMakeLists.txt \ + --replace-fail "RSVG_LIBRARIES} )" "RSVG_LIBRARIES} m)" + for f in ./src/launcher/apps-common.c \ ./src/launcher/icon-theme-common.c do From 573b14b450ca81c085640dc0ccd11a4b20f7df5d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 4 Mar 2025 22:49:15 +0100 Subject: [PATCH 2/3] tint2: minor cleanup --- pkgs/by-name/ti/tint2/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix index af215d59c430..d5fc7052444a 100644 --- a/pkgs/by-name/ti/tint2/package.nix +++ b/pkgs/by-name/ti/tint2/package.nix @@ -82,11 +82,8 @@ stdenv.mkDerivation rec { substituteInPlace src/tint2conf/CMakeLists.txt \ --replace-fail "RSVG_LIBRARIES} )" "RSVG_LIBRARIES} m)" - for f in ./src/launcher/apps-common.c \ - ./src/launcher/icon-theme-common.c - do - substituteInPlace $f --replace-fail /usr/share/ /run/current-system/sw/share/ - done + substituteInPlace src/launcher/apps-common.c src/launcher/icon-theme-common.c \ + --replace-fail /usr/share/ /run/current-system/sw/share/ ''; meta = with lib; { From a76d0ea42eb6a7d6e75d3d157b78f86ee163decc Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 4 Mar 2025 22:55:30 +0100 Subject: [PATCH 3/3] tint2: add versionCheckHook --- pkgs/by-name/ti/tint2/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ti/tint2/package.nix b/pkgs/by-name/ti/tint2/package.nix index d5fc7052444a..b00d34b131e8 100644 --- a/pkgs/by-name/ti/tint2/package.nix +++ b/pkgs/by-name/ti/tint2/package.nix @@ -22,6 +22,7 @@ libXdmcp, libstartup_notification, wrapGAppsHook3, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -86,6 +87,9 @@ stdenv.mkDerivation rec { --replace-fail /usr/share/ /run/current-system/sw/share/ ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = with lib; { homepage = "https://gitlab.com/nick87720z/tint2"; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)";