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

workrave: 1.10.6 -> 1.10.7; fetchFromGitHub; maintain

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2016-05-01 00:29:48 +02:00
parent 2b48d3dae6
commit 5fcf22f57c
No known key found for this signature in database
GPG Key ID: 91CCDB9B48541B99
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/misc/workrave/default.nix
View File

@ -1,22 +1,32 @@
{ stdenv, fetchurl { stdenv, fetchFromGitHub, fetchpatch
, autoconf, automake, gettext, intltool, libtool, pkgconfig , autoconf, automake, gettext, intltool, libtool, pkgconfig
, libICE, libSM, libXScrnSaver, libXtst, cheetah , libICE, libSM, libXScrnSaver, libXtst, cheetah
, glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm , glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm
, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: , dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.10.6";
name = "workrave-${version}"; name = "workrave-${version}";
version = "1.10.7";
src = let src = let
version_ = with stdenv.lib; in fetchFromGitHub {
concatStringsSep "_" (splitString "." version); sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb";
in fetchurl { rev = with stdenv.lib;
name = "${name}.tar.gz"; "v" + concatStringsSep "_" (splitString "." version);
url = "http://github.com/rcaelers/workrave/archive/v${version_}.tar.gz"; repo = "workrave";
sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq"; 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 = [ nativeBuildInputs = [
autoconf automake gettext intltool libtool pkgconfig autoconf automake gettext intltool libtool pkgconfig
]; ];
@ -28,6 +38,8 @@ stdenv.mkDerivation rec {
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A program to help prevent Repetitive Strain Injury"; description = "A program to help prevent Repetitive Strain Injury";
longDescription = '' longDescription = ''
@ -38,7 +50,7 @@ stdenv.mkDerivation rec {
homepage = http://www.workrave.org/; homepage = http://www.workrave.org/;
downloadPage = https://github.com/rcaelers/workrave/releases; downloadPage = https://github.com/rcaelers/workrave/releases;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ prikhi ]; maintainers = with maintainers; [ nckx prikhi ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }