diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-03 19:49:50 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-03 19:52:44 -0400 |
commit | b3e8b01bc9debe5b778d58adb5ea781290172acd (patch) | |
tree | 25a2773df596adfc56c09e3b98e2f678a0220f62 /pkgs/desktops/pantheon | |
parent | 0bb32d27768867c888076f58261bd4af81f904a6 (diff) | |
download | nixlib-b3e8b01bc9debe5b778d58adb5ea781290172acd.tar nixlib-b3e8b01bc9debe5b778d58adb5ea781290172acd.tar.gz nixlib-b3e8b01bc9debe5b778d58adb5ea781290172acd.tar.bz2 nixlib-b3e8b01bc9debe5b778d58adb5ea781290172acd.tar.lz nixlib-b3e8b01bc9debe5b778d58adb5ea781290172acd.tar.xz nixlib-b3e8b01bc9debe5b778d58adb5ea781290172acd.tar.zst nixlib-b3e8b01bc9debe5b778d58adb5ea781290172acd.zip |
pantheon.wingpanel-indicator-datetime: launch elementary-calendar when in PATH
One less downstream patch :)
Diffstat (limited to 'pkgs/desktops/pantheon')
-rw-r--r-- | pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch | 13 | ||||
-rw-r--r-- | pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix | 14 |
2 files changed, 10 insertions, 17 deletions
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch deleted file mode 100644 index 2370fbcd3cb2..000000000000 --- a/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/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index ee5cd5118186..5fa95c75ccc9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/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; |