From faed103fb70e9370ffe2d1f4cddd3cf45c1cb2d4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 15 Nov 2022 20:44:30 +0800 Subject: [PATCH] cinnamon.mint-artwork: 1.6.0 -> 1.6.8 Hided home/trash/network desktop icons by default. Also changed their default logo settings (cs_info and menu), so what we should modify to cinnamon-symbolic is now linuxmint-logo-ring-symbolic. We are lucky, linuxmint-logo-ring-symbolic only appears in a few other places and non of them are useful, menu@cinnamon.org/settings-override.json simply won't work because cinnamon-common doesn't know that file. Also set default cursor theme, this package now directly provides those cursor themes. And, we now default to the Mint-Y-Aqua theme. --- .../services/x11/desktop-managers/cinnamon.nix | 3 +-- pkgs/desktops/cinnamon/mint-artwork/default.nix | 13 +++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 2c59ee410d5f..d5325bc43940 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -171,11 +171,10 @@ in # theme sound-theme-freedesktop nixos-artwork.wallpapers.simple-dark-gray - mint-artwork + mint-artwork # cursors mint-themes mint-x-icons mint-y-icons - vanilla-dmz ] config.environment.cinnamon.excludePackages); xdg.mime.enable = true; diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index 833a28967b4d..68f627feecbd 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,11 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.6.0"; + version = "1.6.8"; src = fetchurl { - url = "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"; - hash = "sha256-un5T56zzN2vRVp42RHczDEKwrweSeygASkFJU5LXCDo="; + urls = [ + "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20221129013553/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + ]; + hash = "sha256-HPnb5Mb6tvzREZbW9SyDNQ6ST6RPmOUVdA9MW8oyRAM="; }; nativeBuildInputs = [ @@ -25,9 +28,7 @@ stdenv.mkDerivation rec { find . -type f -exec sed -i \ -e s,/usr/share/backgrounds/linuxmint/default_background.jpg,${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png,g \ -e s,/usr/share,$out/share,g \ - -e s,DMZ-White,Vanilla-DMZ,g \ - -e s,DMZ-Black,Vanilla-DMZ-AA,g \ - -e s,linuxmint-logo-5,cinnamon-symbolic,g \ + -e s,linuxmint-logo-ring-symbolic,cinnamon-symbolic,g \ {} + # fixup broken symlink