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.

2 files changed, 8 insertions, 5 deletions

diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 5b037a82269d6..41af47eca5db5 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -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}"}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fcff0c1abea0f..fb64bd24b996c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;
   };