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

Merge pull request #37209 from enolan/upgrade-workrave 

workrave: 1.10.7 -> 1.10.20
This commit is contained in:
Jörg Thalheim 2018-03-18 10:50:22 +00:00 committed by GitHub
parent 87ddeaa1b0 5b0985d055
commit fc0a5f4cb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,39 +1,30 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, wrapGAppsHook
, autoconf, automake, gettext, intltool, libtool, pkgconfig , autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig
, libICE, libSM, libXScrnSaver, libXtst, cheetah , libICE, libSM, libXScrnSaver, libXtst, cheetah
, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm , gobjectIntrospection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo
, dbus, dbus-glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: , cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base
, gst-plugins-good, libsigcxx }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "workrave-${version}"; name = "workrave-${version}";
version = "1.10.7"; version = "1.10.20";
src = let src = let
in fetchFromGitHub { in fetchFromGitHub {
sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb"; sha256 = "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941";
rev = with stdenv.lib; rev = with stdenv.lib;
"v" + concatStringsSep "_" (splitString "." version); "v" + concatStringsSep "_" (splitString "." version);
repo = "workrave"; repo = "workrave";
owner = "rcaelers"; 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 autoconf-archive automake gettext intltool libtool pkgconfig wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
libICE libSM libXScrnSaver libXtst cheetah libICE libSM libXScrnSaver libXtst cheetah
glib glibmm gtkmm2 atk pango pangomm cairo cairomm gobjectIntrospection glib glibmm gtkmm3 atk pango pangomm cairo cairomm
dbus dbus-glib GConf gconfmm gdome2 gstreamer libsigcxx dbus dbus-glib gdome2 gstreamer gst-plugins-base gst-plugins-good libsigcxx
]; ];
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";

2
pkgs/top-level/all-packages.nix
View File

@ -18199,8 +18199,8 @@ with pkgs;
worker = callPackage ../applications/misc/worker { }; worker = callPackage ../applications/misc/worker { };
workrave = callPackage ../applications/misc/workrave { workrave = callPackage ../applications/misc/workrave {
inherit (gnome2) GConf gconfmm;
inherit (python27Packages) cheetah; inherit (python27Packages) cheetah;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
}; };
worldengine-cli = python3Packages.worldengine; worldengine-cli = python3Packages.worldengine;