git.iko.soy/typeable/nixpkgs
on master help sign in
pantheon.wingpanel-indicator-datetime: 2.3.1 -> 2.4.0
commitec371d9365e350c6bca0df7cff154c3fea857bb5 authorBobby Rong <rjl931189261@126.com> dateSat 11 Dec 2021, 19:49 (5 years ago) parentfd19c43
2 files changed+17−11
compare with master
unifiedsplit
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix+2−9 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch+15−2
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix+2−9
@@ -1,7 +1,6 @@
11{ lib
22, stdenv
33, fetchFromGitHub
4−, fetchpatch
54, nix-update-script
65, substituteAll
76, pkg-config
@@ -24,13 +23,13 @@
2423
2524stdenv.mkDerivation rec {
2625 pname = "wingpanel-indicator-datetime";
27− version = "2.3.1";
26+ version = "2.4.0";
2827
2928 src = fetchFromGitHub {
3029 owner = "elementary";
3130 repo = pname;
3231 rev = version;
33− sha256 = "sha256-/kbwZVzOlC3ATCuXVMdf2RIskoGQKG1evaDYO3yFerg=";
32+ sha256 = "sha256-GxlnzLDrZmDDAGlUMoM4k4SkbCqra3Th6ugRAj3Wse4=";
3433 };
3534
3635 patches = [
@@ -38,12 +37,6 @@ stdenv.mkDerivation rec {
3837 src = ./fix-paths.patch;
3938 elementary_calendar = elementary-calendar;
4039 })
41− # Fix incorrect month shown on re-opening indicator if previously changed month
42− # https://github.com/elementary/wingpanel-indicator-datetime/pull/284
43− (fetchpatch {
44− url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch";
45− sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4=";
46− })
4740 ];
4841
4942 nativeBuildInputs = [
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch+15−2
@@ -1,8 +1,21 @@
1+diff --git a/src/Indicator.vala b/src/Indicator.vala
2+index 4aba03c..6385bc9 100644
3+--- a/src/Indicator.vala
4++++ b/src/Indicator.vala
5+@@ -55,7 +55,7 @@ public class DateTime.Indicator : Wingpanel.Indicator {
6+
7+ panel_label.button_press_event.connect ((e) => {
8+ if (e.button == Gdk.BUTTON_MIDDLE) {
9+- var command = "io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
10++ var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F"));
11+ try {
12+ var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE);
13+ appinfo.launch_uris (null, null);
114diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala
2−index 6e0d530a..2f90f96c 100644
15+index cb54253..7477d1a 100644
316--- a/src/Widgets/calendar/CalendarView.vala
417+++ b/src/Widgets/calendar/CalendarView.vala
5−@@ -222,7 +222,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
18+@@ -242,7 +242,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
619
720 // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app.
821 public void show_date_in_maya (GLib.DateTime date) {