git.iko.soy/typeable/nixpkgs
on master help sign in
pantheon.wingpanel-indicator-datetime: use upstreamed patch
commitca71d0b22a47e07bfe0008737e238fd50e27b83b authorBobby Rong <rjl931189261@126.com> dateThu 25 Nov 2021, 15:10 (5 years ago) parenta54db16
2 files changed+5−27
compare with master
unifiedsplit
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix+5−1 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch−26
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix+5−1
@@ -1,6 +1,7 @@
11{ lib
22, stdenv
33, fetchFromGitHub
4+, fetchpatch
45, nix-update-script
56, substituteAll
67, pantheon
@@ -40,7 +41,10 @@ stdenv.mkDerivation rec {
4041 })
4142 # Fix incorrect month shown on re-opening indicator if previously changed month
4243 # https://github.com/elementary/wingpanel-indicator-datetime/pull/284
43− ./fix-incorrect-month.patch
44+ (fetchpatch {
45+ url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch";
46+ sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4=";
47+ })
4448 ];
4549
4650 nativeBuildInputs = [
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patchdeleted−26
@@ -1,26 +0,0 @@
1−From 401cb05d7181e69ae8edd347644f2518904e9acb Mon Sep 17 00:00:00 2001
2−From: Jeremy Paul Wootten <jeremywootten@gmail.com>
3−Date: Sat, 30 Oct 2021 17:44:12 +0100
4−Subject: [PATCH] Reset position and relative position after rebuilding
5− carousel
6−
7−---
8− src/Widgets/calendar/CalendarView.vala | 4 ++++
9− 1 file changed, 4 insertions(+)
10−
11−diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala
12−index a41b37a4..f946b91c 100644
13−--- a/src/Widgets/calendar/CalendarView.vala
14−+++ b/src/Widgets/calendar/CalendarView.vala
15−@@ -216,7 +216,11 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
16− carousel.add (right_grid);
17− carousel.scroll_to (start_month_grid);
18− label.label = calmodel.month_start.format (_("%OB, %Y"));
19−+
20−+ position = 1;
21−+ rel_postion = 0;
22− }
23−+
24− carousel.no_show_all = false;
25− }
26−