From 5fcf22f57cd024e2d8e96d5286f5afe91b067398 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 1 May 2016 00:29:48 +0200
Subject: [PATCH] workrave: 1.10.6 -> 1.10.7; fetchFromGitHub; maintain

---
 pkgs/applications/misc/workrave/default.nix | 30 ++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index d082cc30bd7b..e9e34518932f 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -1,22 +1,32 @@
-{ stdenv, fetchurl
+{ stdenv, fetchFromGitHub, fetchpatch
 , autoconf, automake, gettext, intltool, libtool, pkgconfig
 , libICE, libSM, libXScrnSaver, libXtst, cheetah
 , glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm
 , dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
 
 stdenv.mkDerivation rec {
-  version = "1.10.6";
   name = "workrave-${version}";
+  version = "1.10.7";
 
   src = let
-    version_ = with stdenv.lib;
-      concatStringsSep "_" (splitString "." version);
-  in fetchurl {
-    name = "${name}.tar.gz";
-    url = "http://github.com/rcaelers/workrave/archive/v${version_}.tar.gz";
-    sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq";
+  in fetchFromGitHub {
+    sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb";
+    rev = with stdenv.lib;
+      "v" + concatStringsSep "_" (splitString "." version);
+    repo = "workrave";
+    owner = "rcaelers";
   };
 
+  patches = [
+    # Building with gtk{,mm}3 works just fine, but let's be conservative for once:
+    (fetchpatch {
+      name = "workrave-fix-compilation-with-gtk2.patch";
+      url = "https://github.com/rcaelers/workrave/commit/"
+        + "271efdcd795b3592bfede8b1af2162af4b1f0f26.patch";
+      sha256 = "1a3d4jj8516m3m24bl6y8alanl1qnyzv5dv1hz5v3hjgk89fj6rk";
+    })
+  ];
+
   nativeBuildInputs = [
     autoconf automake gettext intltool libtool pkgconfig
   ];
@@ -28,6 +38,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "A program to help prevent Repetitive Strain Injury";
     longDescription = ''
@@ -38,7 +50,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.workrave.org/;
     downloadPage = https://github.com/rcaelers/workrave/releases;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ prikhi ];
+    maintainers = with maintainers; [ nckx prikhi ];
     platforms = platforms.linux;
   };
 }