tint2: 0.12 -> 0.12.7

This commit is contained in:
José Romildo Malaquias 2016-02-28 08:57:08 -03:00
parent dfe69e2f4f
commit ccc64c20e6

View File

@ -1,27 +1,31 @@
{ stdenv, fetchurl, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama { stdenv, fetchFromGitLab, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama
, libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs , libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs
, libXdmcp, librsvg, fetchgit , libXdmcp, librsvg, libstartup_notification
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tint2-${version}"; name = "tint2-${version}";
version = "0.12"; version = "0.12.7";
src = fetchgit { src = fetchFromGitLab {
url = "https://gitlab.com/o9000/tint2.git"; owner = "o9000";
repo = "tint2";
rev = version; rev = version;
sha256 = "0pd84ydpqz2l6gkhj565nqi2xyiph8zfpn4xha60xshqpsg3pqjq"; sha256 = "01wb1yy7zfi01fl34yzpn1d30fykcf8ivmdlynnxp5znqrdsqm2r";
}; };
enableParallelBuilding = true;
buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama
libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs
libXdmcp librsvg libXdmcp librsvg libstartup_notification
]; ];
preConfigure = preConfigure =
'' ''
substituteInPlace CMakeLists.txt --replace /etc $out/etc substituteInPlace CMakeLists.txt --replace /etc $out/etc
''; '';
prePatch = prePatch =
'' ''
substituteInPlace ./src/tint2conf/properties.c --replace /usr/share/ /run/current-system/sw/share/ substituteInPlace ./src/tint2conf/properties.c --replace /usr/share/ /run/current-system/sw/share/
@ -29,11 +33,6 @@ stdenv.mkDerivation rec {
substituteInPlace ./src/launcher/icon-theme-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/
''; '';
cmakeFlags = [
"-DENABLE_TINT2CONF=0"
"-DENABLE_SN=0"
];
meta = { meta = {
homepage = https://gitlab.com/o9000/tint2; homepage = https://gitlab.com/o9000/tint2;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;