Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'

2 files changed, 10 insertions, 17 deletions

diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch
deleted file mode 100644
index 2370fbcd3cb2..000000000000
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Widgets/calendar/Calendar.vala b/src/Widgets/calendar/Calendar.vala
-index 76443ca..d86bd44 100644
---- a/src/Widgets/calendar/Calendar.vala
-+++ b/src/Widgets/calendar/Calendar.vala
-@@ -19,7 +19,7 @@
-
- namespace DateTime.Widgets {
-     public class Calendar : Gtk.Box {
--        private const string CALENDAR_EXEC = "/usr/bin/io.elementary.calendar";
-+        private const string CALENDAR_EXEC = "@elementary-calendar@";
-
-         ControlHeader heading;
-         CalendarView cal;
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index ee5cd5118186..5fa95c75ccc9 100644
--- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -43,15 +43,16 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    (substituteAll {
-      src = ./calendar-exec.patch;
-      elementary-calendar = "${elementary-calendar}/bin/io.elementary.calendar";
-    })
     # Use "clock-format" GSettings key that's been moved to granite
     (fetchpatch {
       url = "https://src.fedoraproject.org/rpms/wingpanel-indicator-datetime/raw/c8d515b76aa812c141212d5515621a6febd781a3/f/00-move-clock-format-settings-to-granite.patch";
       sha256 = "1sq3aw9ckkm057rnrclnw9lyrxbpl37fyzfnbixi2q3ypr70n880";
     })
+    # See: https://github.com/elementary/wingpanel-indicator-datetime/pull/117
+    (fetchpatch {
+      url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/4859e72a52d8dac5cad87b192fc912fb013b0ecd.patch";
+      sha256 = "0jfhb5sax4sivdfx7il1rc1dvhy0yfv27qhvwbdy0hza9wf8q9k0";
+    })
   ];
 
   PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel";
@@ -61,6 +62,11 @@ stdenv.mkDerivation rec {
     patchShebangs meson/post_install.py
   '';
 
+  # launches elementary-calendar on selection
+  preFixup = ''
+     gappsWrapperArgs+=( --prefix PATH : "${elementary-calendar}/bin" )
+  '';
+
   meta = with stdenv.lib; {
     description = "Date & Time Indicator for Wingpanel";
     homepage = https://github.com/elementary/wingpanel-indicator-datetime;