pyrox.dev
workrave: 1.10.6 -> 1.10.7; fetchFromGitHub; maintain
+21
-9
pkgs/applications/misc/workrave/default.nix
+21
-9
pkgs/applications/misc/workrave/default.nix
···
1
-
{ stdenv, fetchurl
1
+
{ stdenv, fetchFromGitHub, fetchpatch
2
2
, autoconf, automake, gettext, intltool, libtool, pkgconfig
3
3
, libICE, libSM, libXScrnSaver, libXtst, cheetah
4
4
, glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm
5
5
, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
6
6
7
7
stdenv.mkDerivation rec {
8
-
version = "1.10.6";
9
8
name = "workrave-${version}";
9
+
version = "1.10.7";
10
10
11
11
src = let
12
-
version_ = with stdenv.lib;
13
-
concatStringsSep "_" (splitString "." version);
14
-
in fetchurl {
15
-
name = "${name}.tar.gz";
16
-
url = "http://github.com/rcaelers/workrave/archive/v${version_}.tar.gz";
17
-
sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq";
12
+
in fetchFromGitHub {
13
+
sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb";
14
+
rev = with stdenv.lib;
15
+
"v" + concatStringsSep "_" (splitString "." version);
16
+
repo = "workrave";
17
+
owner = "rcaelers";
18
18
};
19
19
20
+
patches = [
21
+
# Building with gtk{,mm}3 works just fine, but let's be conservative for once:
22
+
(fetchpatch {
23
+
name = "workrave-fix-compilation-with-gtk2.patch";
24
+
url = "https://github.com/rcaelers/workrave/commit/"
25
+
+ "271efdcd795b3592bfede8b1af2162af4b1f0f26.patch";
26
+
sha256 = "1a3d4jj8516m3m24bl6y8alanl1qnyzv5dv1hz5v3hjgk89fj6rk";
27
+
})
28
+
];
29
+
20
30
nativeBuildInputs = [
21
31
autoconf automake gettext intltool libtool pkgconfig
22
32
];
···
28
38
29
39
preConfigure = "./autogen.sh";
30
40
41
+
enableParallelBuilding = true;
42
+
31
43
meta = with stdenv.lib; {
32
44
description = "A program to help prevent Repetitive Strain Injury";
33
45
longDescription = ''
···
38
50
homepage = http://www.workrave.org/;
39
51
downloadPage = https://github.com/rcaelers/workrave/releases;
40
52
license = licenses.gpl3;
41
-
maintainers = with maintainers; [ prikhi ];
53
+
maintainers = with maintainers; [ nckx prikhi ];
42
54
platforms = platforms.linux;
43
55
};
44
56
}