pantheon.wingpanel-indicator-datetime: use upstreamed patch

main
Bobby Rong 3 years ago
parent a54db1668b
commit ca71d0b22a
No known key found for this signature in database
GPG Key ID: ED07364437C91161
  1. 6
      pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
  2. 26
      pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch

@ -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 = [

@ -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;
}
Loading…
Cancel
Save