From 8c1957866a00bdb20793163719d74efc14da6a14 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Dec 2024 20:45:26 +0800 Subject: [PATCH] cinnamon-control-center: 6.2.0 -> 6.4.0 https://github.com/linuxmint/cinnamon-control-center/compare/6.2.0...6.4.0 The datetime panel was removed, so I assume we don't need tzdata anymore. --- .../by-name/ci/cinnamon-control-center/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix index 2c9308f15a92..f18f5329679a 100644 --- a/pkgs/by-name/ci/cinnamon-control-center/package.nix +++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix @@ -19,7 +19,6 @@ , libgudev , libwacom , wrapGAppsHook3 -, tzdata , glibc , libnma , modemmanager @@ -34,13 +33,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Blod69RzPTE3DztRo0PK0MKCE+vq0HWrcJcC/1e8eRI="; + hash = "sha256-hS1vFrwMYUinFLWx33nnlcXwcMkqDCivElI1HaZsSSE="; }; buildInputs = [ @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { colord libgudev libwacom - tzdata networkmanager libnma modemmanager @@ -67,15 +65,7 @@ stdenv.mkDerivation rec { upower ]; - /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/" - ./panels/datetime/tz.h:32:# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" - ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */ - postPatch = '' - sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c - sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h - sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c - patchShebangs meson_install_schemas.py '';