summary refs log tree commit diff
path: root/pkgs/applications/misc/tint2
diff options
context:
space:
mode:
authorTravis Athougies <travis@athougies.net>2016-02-15 14:52:13 -0800
committerTravis Athougies <travis@athougies.net>2016-02-16 18:36:58 -0800
commite5e4e27e740c945f769f649166e2f445dc556248 (patch)
treea4adca3f91e8f9a45eda93b009dafef126c3f2f9 /pkgs/applications/misc/tint2
parenteb4d571cb6175b24671c45182cc1fa99fe697242 (diff)
downloadnixpkgs-e5e4e27e740c945f769f649166e2f445dc556248.tar
nixpkgs-e5e4e27e740c945f769f649166e2f445dc556248.tar.gz
nixpkgs-e5e4e27e740c945f769f649166e2f445dc556248.tar.bz2
nixpkgs-e5e4e27e740c945f769f649166e2f445dc556248.tar.lz
nixpkgs-e5e4e27e740c945f769f649166e2f445dc556248.tar.xz
nixpkgs-e5e4e27e740c945f769f649166e2f445dc556248.tar.zst
nixpkgs-e5e4e27e740c945f769f649166e2f445dc556248.zip
tints: 0.11 -> 0.12
Diffstat (limited to 'pkgs/applications/misc/tint2')
-rw-r--r--pkgs/applications/misc/tint2/default.nix27
1 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 9eb3ed13af5..e8412ce1916 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,30 +1,41 @@
 { stdenv, fetchurl, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama
 , libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs
-, libXdmcp
+, libXdmcp, librsvg, fetchgit
 }:
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.11";
+  version = "0.12";
 
-  src = fetchurl {
-    url = "http://tint2.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "07a74ag7lhc6706z34zvqj2ikyyl7wnzisfxpld67ljpc1m6w47y";
+  src = fetchgit {
+    url = "https://gitlab.com/o9000/tint2.git";
+    rev = version;
+    sha256 = "0pd84ydpqz2l6gkhj565nqi2xyiph8zfpn4xha60xshqpsg3pqjq";
   };
         
   buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama
     libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs
-    libXdmcp
+    libXdmcp librsvg
   ];
 
-  preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
+  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/
+    '';
 
   cmakeFlags = [
     "-DENABLE_TINT2CONF=0"
+    "-DENABLE_SN=0"
   ];
 
   meta = {
-    homepage = http://code.google.com/p/tint2;
+    homepage = https://gitlab.com/o9000/tint2;
     license = stdenv.lib.licenses.gpl2;
     description = "A simple panel/taskbar unintrusive and light (memory / cpu / aestetic)";
     platforms = stdenv.lib.platforms.linux;