public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14685 from romildo/upd.tint2 

tint2: 0.12.7 -> 0.12.9
This commit is contained in:
joachifm 2016-04-14 13:26:54 +02:00
parent 840f3230a2 08540cdd1e
commit 21d6e4beba
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/applications/misc/tint2/default.nix
View File

@ -1,36 +1,40 @@
{ stdenv, fetchFromGitLab, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, pango, cairo, glib
, libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs , pcre , imlib2, libXinerama , libXrender, libXcomposite, libXdamage, libX11
, libXdmcp, librsvg, libstartup_notification , libXrandr, gtk, libpthreadstubs , libXdmcp, librsvg
, libstartup_notification, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tint2-${version}"; name = "tint2-${version}";
version = "0.12.7"; version = "0.12.9";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "o9000"; owner = "o9000";
repo = "tint2"; repo = "tint2";
rev = version; rev = version;
sha256 = "01wb1yy7zfi01fl34yzpn1d30fykcf8ivmdlynnxp5znqrdsqm2r"; sha256 = "17n3yssqiwxqrwsxypzw8skwzxm2540ikbyx7kfxv2gqlbjx5y6q";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ];
libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs
libXdmcp librsvg libstartup_notification
];
preConfigure = 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 substituteInPlace CMakeLists.txt --replace /etc $out/etc
''; '';
prePatch = prePatch = ''
'' for f in ./src/tint2conf/properties.c \
substituteInPlace ./src/tint2conf/properties.c --replace /usr/share/ /run/current-system/sw/share/ ./src/launcher/apps-common.c \
substituteInPlace ./src/launcher/apps-common.c --replace /usr/share/ /run/current-system/sw/share/ ./src/launcher/icon-theme-common.c \
substituteInPlace ./src/launcher/icon-theme-common.c --replace /usr/share/ /run/current-system/sw/share/ ./themes/*tint2rc
do
substituteInPlace $f --replace /usr/share/ /run/current-system/sw/share/
done
''; '';
meta = { meta = {