From c4a62ad40221e88e69b0c79fb5fddaf3f71fc8b9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 19 Jul 2024 22:19:46 +0800 Subject: [PATCH] cinnamon.iso-flags-svg: Drop Not used in Cinnamon and the SVGs are installed to a non-standard path. --- pkgs/desktops/cinnamon/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 67b253200d91..c5b52392da90 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -1,11 +1,6 @@ { config, pkgs, lib }: lib.makeScope pkgs.newScope (self: with self; { - iso-flags-svg = pkgs.iso-flags.overrideAttrs (p: p // { - buildPhase = "mkdir -p $out/share"; - installPhase = "mv svg $out/share/iso-flags-svg"; - }); - # Extensions added here will be shipped by default # We keep this in sync with a default Mint installation # Right now (only) nemo-share is missing @@ -37,6 +32,7 @@ lib.makeScope pkgs.newScope (self: with self; { # Aliases need to be outside the scope or they will shadow the attributes from parent scope. bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14 iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14 + iso-flags-svg = throw "cinnamon.iso-flags-svg was removed because this is not used in Cinnamon. You can directly obtain the images from \"\${pkgs.iso-flags.src}/svg\"."; # Added on 2024-07-14 folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14 mint-artwork = lib.warn "cinnamon.mint-artwork was moved to top-level. Please use pkgs.mint-artwork directly." pkgs.mint-artwork; # Added on 2024-07-14 mint-cursor-themes = lib.warn "cinnamon.mint-cursor-themes was moved to top-level. Please use pkgs.mint-cursor-themes directly." pkgs.mint-cursor-themes; # Added on 2024-07-14