papirus-icon-theme: add withElementary optional argument

Upstream advices to make optional the installation of ePapirus and
ePapirus-Dark icon themes, in order to reduce inodes and package
size. Those themes are recommended for the ElementaryOS and Pantheon desktop
environments.

Therefore papirus-icon-theme does not include ePapirus* anymore. But
the new epapirus-icon-theme includes all of them, and is suitable for
use with ElementaryOS or Pantheon.
This commit is contained in:
José Romildo 2023-11-16 17:20:01 -03:00
parent d28775dde5
commit 41c836ad8e
2 changed files with 8 additions and 5 deletions

View File

@ -2,12 +2,12 @@
, stdenvNoCC
, fetchFromGitHub
, gtk3
, pantheon
, breeze-icons
, gnome-icon-theme
, elementary-icon-theme
, hicolor-icon-theme
, papirus-folders
, color ? null
, withElementary ? false
, gitUpdater
}:
@ -28,10 +28,10 @@ stdenvNoCC.mkDerivation rec {
];
propagatedBuildInputs = [
pantheon.elementary-icon-theme
breeze-icons
gnome-icon-theme
hicolor-icon-theme
] ++ lib.optional withElementary [
elementary-icon-theme
];
dontDropIconThemeCache = true;
@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation rec {
runHook preInstall
mkdir -p $out/share/icons
mv {,e}Papirus* $out/share/icons
mv ${lib.optionalString withElementary "{,e}"}Papirus* $out/share/icons
for theme in $out/share/icons/*; do
${lib.optionalString (color != null) "${papirus-folders}/bin/papirus-folders -t $theme -o -C ${color}"}

View File

@ -29267,6 +29267,8 @@ with pkgs;
eduli = callPackage ../data/fonts/eduli { };
epapirus-icon-theme = papirus-icon-theme.override { withElementary = true; };
moeli = eduli;
edusong = callPackage ../data/fonts/edusong { };
@ -29800,6 +29802,7 @@ with pkgs;
paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme {
inherit (pantheon) elementary-icon-theme;
inherit (plasma5Packages) breeze-icons;
};