From b9d4794ff9867892a546c7caec91973a891a3cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 2 Dec 2021 11:30:02 -0300 Subject: [PATCH 1/2] pop-icon-theme: remove some dependencies - Some third-party inherits have been removed from the icon theme by upstream. See https://github.com/pop-os/icon-theme/pull/100 (cherry picked from commit 2ae84eb551220de68abf5ac55a0d95c1cefc69da) --- pkgs/data/icons/pop-icon-theme/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index 3f980539a110..bb94a36d98d7 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -4,9 +4,7 @@ , meson , ninja , gtk3 -, breeze-icons -, gnome -, pantheon +, adwaita-icon-theme , hicolor-icon-theme }: @@ -28,9 +26,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - breeze-icons - gnome.adwaita-icon-theme - pantheon.elementary-icon-theme + adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b62a8402c31b..2aacf653142f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23533,7 +23533,7 @@ with pkgs; pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; pop-icon-theme = callPackage ../data/icons/pop-icon-theme { - inherit (plasma5Packages) breeze-icons; + inherit (gnome) adwaita-icon-theme; }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; From 10fa59eb0344935fe4d3a8c54bcd4e22f8eb1ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 2 Dec 2021 14:45:28 -0300 Subject: [PATCH 2/2] pop-icon-theme: restrict platforms to linux (cherry picked from commit 82ee5f20c7a3881a00257978f98b2e2c4622330c) --- pkgs/data/icons/pop-icon-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index bb94a36d98d7..7254e8bc2139 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Icon theme for Pop!_OS with a semi-flat design and raised 3D motifs"; homepage = "https://github.com/pop-os/icon-theme"; license = with licenses; [ cc-by-sa-40 gpl3 ]; - platforms = platforms.unix; + platforms = platforms.linux; # hash mismatch on darwin due to file names differing only in case maintainers = with maintainers; [ romildo ]; }; }