From 86746f410aad672602d2e7c581a4f7b41238af45 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Fri, 5 Dec 2025 13:55:25 -0800 Subject: [PATCH] beauty-line-icon-theme: move to by-name/ --- .../be/beauty-line-icon-theme/package.nix} | 20 +++++++++---------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 10 insertions(+), 14 deletions(-) rename pkgs/{data/icons/beauty-line-icon-theme/default.nix => by-name/be/beauty-line-icon-theme/package.nix} (74%) diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/by-name/be/beauty-line-icon-theme/package.nix similarity index 74% rename from pkgs/data/icons/beauty-line-icon-theme/default.nix rename to pkgs/by-name/be/beauty-line-icon-theme/package.nix index af4c09e9adff..c92199cd7dc0 100644 --- a/pkgs/data/icons/beauty-line-icon-theme/default.nix +++ b/pkgs/by-name/be/beauty-line-icon-theme/package.nix @@ -2,16 +2,16 @@ lib, stdenvNoCC, fetchFromGitLab, - breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon, jdupes, + libsForQt5, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "BeautyLine"; version = "2.4"; @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { # ubuntu-mono is also required but missing in ubuntu-themes (please add it if it is packaged at some point) propagatedBuildInputs = [ - breeze-icons + libsForQt5.breeze-icons gnome-icon-theme hicolor-icon-theme mint-x-icons @@ -44,20 +44,20 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/icons/${pname} - cp -r * $out/share/icons/${pname}/ - gtk-update-icon-cache $out/share/icons/${pname} + mkdir -p $out/share/icons/BeautyLine + cp -r * $out/share/icons/BeautyLine/ + gtk-update-icon-cache $out/share/icons/BeautyLine jdupes --link-soft --recurse $out/share runHook postInstall ''; - meta = with lib; { + meta = { description = "BeautyLine icon theme"; homepage = "https://www.gnome-look.org/p/1425426/"; - platforms = platforms.linux; - license = [ licenses.publicDomain ]; - maintainers = with maintainers; [ lwb-2021 ]; + platforms = lib.platforms.linux; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ lwb-2021 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecfd17534928..0aec23c18a1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1707,10 +1707,6 @@ with pkgs; bat-extras = recurseIntoAttrs (lib.makeScope newScope (import ../tools/misc/bat-extras)); - beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme { - inherit (plasma5Packages) breeze-icons; - }; - beautysh = with python3.pkgs; toPythonApplication beautysh; inherit (callPackages ../misc/logging/beats/7.x.nix { })