Skip to content

Commit

Permalink
pantheon.wingpanel-indicator-datetime: launch elementary-calendar whe…
Browse files Browse the repository at this point in the history
…n in PATH

One less downstream patch :)
  • Loading branch information
worldofpeace committed Apr 3, 2019
1 parent 0bb32d2 commit b3e8b01
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 17 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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;
Expand Down

0 comments on commit b3e8b01

Please sign in to comment.