diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2016-04-14 08:01:32 -0300 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2016-04-14 08:01:32 -0300 |
| commit | 08540cdd1e4703bf42cddb28d646b5b126490523 (patch) | |
| tree | f1b733920d9de3983beff5767f8c859fd4e9cf12 /pkgs/applications/misc/tint2 | |
| parent | 12e919bb34d120872a1eb508b752bad638957b20 (diff) | |
| download | nixpkgs-08540cdd1e4703bf42cddb28d646b5b126490523.tar nixpkgs-08540cdd1e4703bf42cddb28d646b5b126490523.tar.gz nixpkgs-08540cdd1e4703bf42cddb28d646b5b126490523.tar.bz2 nixpkgs-08540cdd1e4703bf42cddb28d646b5b126490523.tar.lz nixpkgs-08540cdd1e4703bf42cddb28d646b5b126490523.tar.xz nixpkgs-08540cdd1e4703bf42cddb28d646b5b126490523.tar.zst nixpkgs-08540cdd1e4703bf42cddb28d646b5b126490523.zip | |
tint2: 0.12.7 -> 0.12.9
Diffstat (limited to 'pkgs/applications/misc/tint2')
| -rw-r--r-- | pkgs/applications/misc/tint2/default.nix | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index f4162147258..c21c0d32b73 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; |