diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix similarity index 56% rename from pkgs/data/icons/la-capitaine-icon-theme/default.nix rename to pkgs/by-name/la/la-capitaine-icon-theme/package.nix index bf0df6858f0c..e3dd010f7098 100644 --- a/pkgs/data/icons/la-capitaine-icon-theme/default.nix +++ b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix @@ -2,26 +2,26 @@ lib, stdenvNoCC, fetchFromGitHub, - breeze-icons, - elementary-icon-theme, gnome-icon-theme, hicolor-icon-theme, + pantheon, + libsForQt5, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "la-capitaine-icon-theme"; version = "0.6.2"; src = fetchFromGitHub { owner = "keeferrourke"; repo = "la-capitaine-icon-theme"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-+n+GN5sCcWTyAigtgyudliOTulP7ECoOCYdm01trokU="; }; propagatedBuildInputs = [ - breeze-icons - elementary-icon-theme + libsForQt5.breeze-icons + pantheon.elementary-icon-theme gnome-icon-theme hicolor-icon-theme ]; @@ -37,21 +37,21 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/icons/$pname - cp -a * $out/share/icons/$pname - rm $out/share/icons/$pname/{configure,COPYING,LICENSE,*.md} - cp "$out/share/icons/$pname/places/scalable/"distributor-logo-{archlinux,debian,kubuntu}.svg "$out/share/icons/$pname/apps/scalable/" + mkdir -p $out/share/icons/la-capitaine-icon-theme + cp -a * $out/share/icons/la-capitaine-icon-theme + rm $out/share/icons/la-capitaine-icon-theme/{configure,COPYING,LICENSE,*.md} + cp "$out/share/icons/la-capitaine-icon-theme/places/scalable/"distributor-logo-{archlinux,debian,kubuntu}.svg "$out/share/icons/la-capitaine-icon-theme/apps/scalable/" runHook postInstall ''; - meta = with lib; { + meta = { description = "Icon theme inspired by macOS and Google's Material Design"; homepage = "https://github.com/keeferrourke/la-capitaine-icon-theme"; - license = with licenses; [ + license = with lib.licenses; [ gpl3Plus mit ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ romildo ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b757354a103..61edfb3e85b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10377,11 +10377,6 @@ with pkgs; kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; - la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme { - inherit (plasma5Packages) breeze-icons; - inherit (pantheon) elementary-icon-theme; - }; - inherit (callPackages ../data/fonts/liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2