Merge pull request #14685 from romildo/upd.tint2

tint2: 0.12.7 -> 0.12.9

joachifm 21d6e4be 840f3230

+23 -19
+23 -19
pkgs/applications/misc/tint2/default.nix
··· 1 - { stdenv, fetchFromGitLab, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama 2 - , libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs 3 - , libXdmcp, librsvg, libstartup_notification 1 + { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, pango, cairo, glib 2 + , pcre , imlib2, libXinerama , libXrender, libXcomposite, libXdamage, libX11 3 + , libXrandr, gtk, libpthreadstubs , libXdmcp, librsvg 4 + , libstartup_notification, wrapGAppsHook 4 5 }: 5 6 6 7 stdenv.mkDerivation rec { 7 8 name = "tint2-${version}"; 8 - version = "0.12.7"; 9 + version = "0.12.9"; 9 10 10 11 src = fetchFromGitLab { 11 12 owner = "o9000"; 12 13 repo = "tint2"; 13 14 rev = version; 14 - sha256 = "01wb1yy7zfi01fl34yzpn1d30fykcf8ivmdlynnxp5znqrdsqm2r"; 15 + sha256 = "17n3yssqiwxqrwsxypzw8skwzxm2540ikbyx7kfxv2gqlbjx5y6q"; 15 16 }; 16 17 17 18 enableParallelBuilding = true; 18 19 19 - buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama 20 - libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs 21 - libXdmcp librsvg libstartup_notification 22 - ]; 20 + nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ]; 23 21 24 - preConfigure = 25 - '' 26 - substituteInPlace CMakeLists.txt --replace /etc $out/etc 27 - ''; 22 + buildInputs = [ pango cairo glib pcre imlib2 libXinerama libXrender 23 + libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs libXdmcp 24 + librsvg libstartup_notification ]; 28 25 29 - prePatch = 30 - '' 31 - substituteInPlace ./src/tint2conf/properties.c --replace /usr/share/ /run/current-system/sw/share/ 32 - substituteInPlace ./src/launcher/apps-common.c --replace /usr/share/ /run/current-system/sw/share/ 33 - substituteInPlace ./src/launcher/icon-theme-common.c --replace /usr/share/ /run/current-system/sw/share/ 34 - ''; 26 + preConfigure = '' 27 + substituteInPlace CMakeLists.txt --replace /etc $out/etc 28 + ''; 29 + 30 + prePatch = '' 31 + for f in ./src/tint2conf/properties.c \ 32 + ./src/launcher/apps-common.c \ 33 + ./src/launcher/icon-theme-common.c \ 34 + ./themes/*tint2rc 35 + do 36 + substituteInPlace $f --replace /usr/share/ /run/current-system/sw/share/ 37 + done 38 + ''; 35 39 36 40 meta = { 37 41 homepage = https://gitlab.com/o9000/tint2;