diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-11-25 15:10:03 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2021-11-25 21:00:24 +0800 |
| commit | ca71d0b22a47e07bfe0008737e238fd50e27b83b (patch) | |
| tree | 0b71270456265b75996faecc50b37553e8782e22 /pkgs/desktops/pantheon | |
| parent | a54db1668b888c1f6dddd8c644b203df21697088 (diff) | |
pantheon.wingpanel-indicator-datetime: use upstreamed patch
Diffstat (limited to 'pkgs/desktops/pantheon')
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch | 26 |
2 files changed, 5 insertions, 27 deletions
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 8226ed5b0b3cf..d9c2cdc903385 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , substituteAll , pantheon @@ -40,7 +41,10 @@ stdenv.mkDerivation rec { }) # Fix incorrect month shown on re-opening indicator if previously changed month # https://github.com/elementary/wingpanel-indicator-datetime/pull/284 - ./fix-incorrect-month.patch + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch"; + sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch deleted file mode 100644 index 7e0dc09b16c2c..0000000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 401cb05d7181e69ae8edd347644f2518904e9acb Mon Sep 17 00:00:00 2001 -From: Jeremy Paul Wootten <jeremywootten@gmail.com> -Date: Sat, 30 Oct 2021 17:44:12 +0100 -Subject: [PATCH] Reset position and relative position after rebuilding - carousel - ---- - src/Widgets/calendar/CalendarView.vala | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala -index a41b37a4..f946b91c 100644 ---- a/src/Widgets/calendar/CalendarView.vala -+++ b/src/Widgets/calendar/CalendarView.vala -@@ -216,7 +216,11 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { - carousel.add (right_grid); - carousel.scroll_to (start_month_grid); - label.label = calmodel.month_start.format (_("%OB, %Y")); -+ -+ position = 1; -+ rel_postion = 0; - } -+ - carousel.no_show_all = false; - } - |