diff options
author | Echo Nolan <echo@echonolan.net> | 2018-03-16 19:56:51 -0700 |
---|---|---|
committer | Echo Nolan <echo@echonolan.net> | 2018-03-16 19:56:51 -0700 |
commit | 250c19c7467d616abf5d645832f75b04c31fc6e8 (patch) | |
tree | 5c7c5b1d847289d1108cf85fecc56458d64822a9 /pkgs/applications/misc/workrave | |
parent | b80dd958d053f56802874fdb440c8f821db751c3 (diff) | |
download | nixpkgs-250c19c7467d616abf5d645832f75b04c31fc6e8.tar nixpkgs-250c19c7467d616abf5d645832f75b04c31fc6e8.tar.gz nixpkgs-250c19c7467d616abf5d645832f75b04c31fc6e8.tar.bz2 nixpkgs-250c19c7467d616abf5d645832f75b04c31fc6e8.tar.lz nixpkgs-250c19c7467d616abf5d645832f75b04c31fc6e8.tar.xz nixpkgs-250c19c7467d616abf5d645832f75b04c31fc6e8.tar.zst nixpkgs-250c19c7467d616abf5d645832f75b04c31fc6e8.zip |
workrave: 1.10.7 -> 1.10.20
Also: switch to GTK-3, fix GSettings by using wrapGAppsHook.
Diffstat (limited to 'pkgs/applications/misc/workrave')
-rw-r--r-- | pkgs/applications/misc/workrave/default.nix | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 0394fa83d4a..7378a8cb476 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,39 +1,29 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, autoconf, automake, gettext, intltool, libtool, pkgconfig +{ stdenv, fetchFromGitHub, wrapGAppsHook +, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig , libICE, libSM, libXScrnSaver, libXtst, cheetah -, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm -, dbus, dbus-glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: +, gobjectIntrospection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo +, cairomm , dbus, dbus-glib, gdome2, gstreamer, libsigcxx }: stdenv.mkDerivation rec { name = "workrave-${version}"; - version = "1.10.7"; + version = "1.10.20"; src = let in fetchFromGitHub { - sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb"; + sha256 = "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941"; 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 + autoconf autoconf-archive automake gettext intltool libtool pkgconfig wrapGAppsHook ]; buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah - glib glibmm gtkmm2 atk pango pangomm cairo cairomm - dbus dbus-glib GConf gconfmm gdome2 gstreamer libsigcxx + gobjectIntrospection glib glibmm gtkmm3 atk pango pangomm cairo cairomm + dbus dbus-glib gdome2 gstreamer libsigcxx ]; preConfigure = "./autogen.sh"; |