From 268f697cde1117e737a9b22588d2669fe5ba8517 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Fri, 5 Dec 2025 13:32:50 -0800 Subject: [PATCH] flat-remix-icon-theme: move to by-name/ --- .../fl/flat-remix-icon-theme/package.nix} | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 9 insertions(+), 12 deletions(-) rename pkgs/{data/icons/flat-remix-icon-theme/default.nix => by-name/fl/flat-remix-icon-theme/package.nix} (77%) diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix similarity index 77% rename from pkgs/data/icons/flat-remix-icon-theme/default.nix rename to pkgs/by-name/fl/flat-remix-icon-theme/package.nix index ad9d166a5a6b..18f55e5cbda9 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix @@ -3,21 +3,21 @@ stdenvNoCC, fetchFromGitHub, gtk3, - breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme, + libsForQt5, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "flat-remix-icon-theme"; version = "20240201"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix"; - rev = version; - sha256 = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo="; + tag = finalAttrs.version; + hash = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ - breeze-icons + libsForQt5.breeze-icons pantheon.elementary-icon-theme gnome-icon-theme hicolor-icon-theme @@ -45,12 +45,12 @@ stdenvNoCC.mkDerivation rec { recordPropagatedDependencies ''; - meta = with lib; { + meta = { description = "Flat remix is a pretty simple icon theme inspired on material design"; homepage = "https://drasite.com/flat-remix"; - license = with licenses; [ gpl3Only ]; + license = with lib.licenses; [ gpl3Only ]; # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux - platforms = platforms.linux; + platforms = lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6adc455d2e9c..e699afd9cdba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10335,9 +10335,6 @@ with pkgs; moeli = eduli; - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { - inherit (plasma5Packages) breeze-icons; - }; font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4; font-awesome_5 = (callPackage ../data/fonts/font-awesome { }).v5; font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6;