git.iko.soy/typeable/nixpkgs
on master help sign in
pantheon.wingpanel-indicator-datetime: launch elementary-calendar when in PATH

One less downstream patch :)

commitb3e8b01bc9debe5b778d58adb5ea781290172acd authorworldofpeace <worldofpeace@users.noreply.github.com> dateWed 3 Apr 2019, 19:49 (8 years ago) parent0bb32d2
2 files changed+10−17
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch−13 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix+10−4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/src/Widgets/calendar/Calendar.vala b/src/Widgets/calendar/Calendar.vala
2−index 76443ca..d86bd44 100644
3−--- a/src/Widgets/calendar/Calendar.vala
4−+++ b/src/Widgets/calendar/Calendar.vala
5−@@ -19,7 +19,7 @@
6−
7− namespace DateTime.Widgets {
8− public class Calendar : Gtk.Box {
9−- private const string CALENDAR_EXEC = "/usr/bin/io.elementary.calendar";
10−+ private const string CALENDAR_EXEC = "@elementary-calendar@";
11−
12− ControlHeader heading;
13− CalendarView cal;
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix+10−4
@@ -43,15 +43,16 @@ stdenv.mkDerivation rec {
4343 ];
4444
4545 patches = [
46− (substituteAll {
47− src = ./calendar-exec.patch;
48− elementary-calendar = "${elementary-calendar}/bin/io.elementary.calendar";
49− })
5046 # Use "clock-format" GSettings key that's been moved to granite
5147 (fetchpatch {
5248 url = "https://src.fedoraproject.org/rpms/wingpanel-indicator-datetime/raw/c8d515b76aa812c141212d5515621a6febd781a3/f/00-move-clock-format-settings-to-granite.patch";
5349 sha256 = "1sq3aw9ckkm057rnrclnw9lyrxbpl37fyzfnbixi2q3ypr70n880";
5450 })
51+ # See: https://github.com/elementary/wingpanel-indicator-datetime/pull/117
52+ (fetchpatch {
53+ url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/4859e72a52d8dac5cad87b192fc912fb013b0ecd.patch";
54+ sha256 = "0jfhb5sax4sivdfx7il1rc1dvhy0yfv27qhvwbdy0hza9wf8q9k0";
55+ })
5556 ];
5657
5758 PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
@@ -61,6 +62,11 @@ stdenv.mkDerivation rec {
6162 patchShebangs meson/post_install.py
6263 '';
6364
65+ # launches elementary-calendar on selection
66+ preFixup = ''
67+ gappsWrapperArgs+=( --prefix PATH : "${elementary-calendar}/bin" )
68+ '';
69+
6470 meta = with stdenv.lib; {
6571 description = "Date & Time Indicator for Wingpanel";
6672 homepage = https://github.com/elementary/wingpanel-indicator-datetime;