Merge pull request #14685 from romildo/upd.tint2

tint2: 0.12.7 -> 0.12.9

1 files changed, 25 insertions, 21 deletions

diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index f4162147258c..c21c0d32b730 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,37 +1,41 @@
-{ stdenv, fetchFromGitLab, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama
-, libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs
-, libXdmcp, librsvg, libstartup_notification
+{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, pango, cairo, glib
+, pcre , imlib2, libXinerama , libXrender, libXcomposite, libXdamage, libX11
+, libXrandr, gtk, libpthreadstubs , libXdmcp, librsvg
+, libstartup_notification, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.12.7";
+  version = "0.12.9";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "tint2";
     rev = version;
-    sha256 = "01wb1yy7zfi01fl34yzpn1d30fykcf8ivmdlynnxp5znqrdsqm2r";
+    sha256 = "17n3yssqiwxqrwsxypzw8skwzxm2540ikbyx7kfxv2gqlbjx5y6q";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama
-    libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs
-    libXdmcp librsvg libstartup_notification
-  ];
-
-  preConfigure =
-    ''
-      substituteInPlace CMakeLists.txt --replace /etc $out/etc
-    '';
-
-  prePatch =
-    ''
-      substituteInPlace ./src/tint2conf/properties.c --replace /usr/share/ /run/current-system/sw/share/
-      substituteInPlace ./src/launcher/apps-common.c --replace /usr/share/ /run/current-system/sw/share/
-      substituteInPlace ./src/launcher/icon-theme-common.c --replace /usr/share/ /run/current-system/sw/share/
-    '';
+  nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ];
+
+  buildInputs = [ pango cairo glib pcre imlib2 libXinerama libXrender
+    libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs libXdmcp
+    librsvg libstartup_notification ];
+
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt --replace /etc $out/etc
+  '';
+
+  prePatch = ''
+    for f in ./src/tint2conf/properties.c \
+             ./src/launcher/apps-common.c \
+             ./src/launcher/icon-theme-common.c \
+             ./themes/*tint2rc
+    do
+      substituteInPlace $f --replace /usr/share/ /run/current-system/sw/share/
+    done
+  '';
 
   meta = {
     homepage = https://gitlab.com/o9000/tint2;