From 840f7dda71a8d01337cd3a441751f929e9e04097 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Nov 2022 22:26:31 +0800
Subject: [PATCH] cinnamon.cinnamon-control-center: 5.4.7 -> 5.6.0
I removed the treewide /usr/share/locale sed, there are still
a few leftovers but non of them are useful (for test-endianess.c
we already fixed /usr/share/i18n/locales/, and we don't use gdm
so gdm-languages.c is not useful).
Also no longer depend on cinnamon-settings-daemon.
https://github.com/linuxmint/cinnamon-control-center/compare/5.4.7...5.6.0
---
.../cinnamon/cinnamon-control-center/default.nix | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
index c0a34fc093dc..6d4d96ae3141 100644
--- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
@@ -9,7 +9,6 @@
, libnotify
, libxml2
, gnome-online-accounts
-, cinnamon-settings-daemon
, colord
, polkit
, libxkbfile
@@ -36,13 +35,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-control-center";
- version = "5.4.7";
+ version = "5.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
- hash = "sha256-38n1QCygkBq+wOLwui1oF6MtDWxAFWxp5U1omSVtbro=";
+ hash = "sha256-WK35uDckIYU4HwuYtLj+CFVJD8O78LTQcnOvjp/et2s=";
};
buildInputs = [
@@ -56,7 +55,6 @@ stdenv.mkDerivation rec {
libgnomekbd
libxklavier
colord
- cinnamon-settings-daemon
libgudev
libwacom
gnome-online-accounts
@@ -75,10 +73,6 @@ stdenv.mkDerivation rec {
./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */
postPatch = ''
- find . -type f -exec sed -i \
- -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
- {} +
-
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