From a91fdc500c11dc1cae7622086e66e4d1669b193b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 5 May 2024 20:38:33 +0800 Subject: [PATCH 1/2] cinnamon.mint-artwork: 1.8.0 -> 1.8.2 This removes Adwaita, HighContrast from Cinnamon styles. --- pkgs/desktops/cinnamon/mint-artwork/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 7641272b0ec8..ef2c6ec4fa2c 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20240122135036/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20240505123538/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-eCrch5IQdTd92DIqdjZFzvE4oShv3HuXfrLLUmLb0Ms="; + hash = "sha256-MegMFrnU8Gcc2v5y3BQCIZS31JdpfSM5FIJJNcyt4LY="; }; nativeBuildInputs = [ From 9c33def46f520e7ac31bd7790d80d8792e2f322b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 5 May 2024 20:57:13 +0800 Subject: [PATCH 2/2] cinnamon.cinnamon-common: Don't ship 00_cinnamon.styles --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 5ee3e5e27383..957af3062422 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -184,6 +184,10 @@ stdenv.mkDerivation rec { # g-o-a-gtk already provides its own desktop item. rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop + + # Actually removes Adwaita and HighContrast from Cinnamon styles with mint-artwork 1.8.2. + # https://github.com/linuxmint/cinnamon/commit/13b1ad104e88197f6c4e2d02ab2674c07254b8e8 + rm -r $out/share/cinnamon/styles.d ''; preFixup = ''