Commit f7978318 authored by Guy Chronister's avatar Guy Chronister
Browse files

marwaita-icons: fix build, migrate to by-name, use finalAttrs 

- Switch to finalAttrs form in mkDerivation for consistency with by-name.
- Use `tag = version` instead of `rev = version` to follow upstream tag naming.
- Replace deprecated `breeze-icons` argument with `kdePackages.breeze-icons`.
- Remove unused breeze-icons argument from callPackage.
- Drop top-level `marwaita-icons` attribute now that the package lives fully
  under pkgs/by-name.
parent 7fd86391

pkgs/by-name/ma/marwaita-icons/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -3,19 +3,19 @@ 
  stdenvNoCC,

  fetchFromGitHub,

  gtk3,

  breeze-icons,

  hicolor-icon-theme,

  pantheon,

  kdePackages,

}:



stdenvNoCC.mkDerivation rec {

stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "marwaita-icons";

  version = "5.1";



  src = fetchFromGitHub {

    owner = "darkomarko42";

    repo = "marwaita-icons";

    rev = version;

    tag = finalAttrs.version;

    hash = "sha256-UehujziT13kA9ltjyCvbSDTEpR8ISxoBpoLj22Zih8k=";

  };
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { 
  ];



  propagatedBuildInputs = [

    breeze-icons

    kdePackages.breeze-icons

    hicolor-icon-theme

    pantheon.elementary-icon-theme

  ];
@@ -55,4 +55,4 @@ stdenvNoCC.mkDerivation rec { 
    platforms = lib.platforms.linux;

    maintainers = [ lib.maintainers.romildo ];

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -10111,10 +10111,6 @@ with pkgs; 
  # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi

  lohit-fonts = recurseIntoAttrs (callPackages ../data/fonts/lohit-fonts { });



  marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix {

    inherit (kdePackages) breeze-icons;

  };



  mplus-outline-fonts = recurseIntoAttrs (callPackage ../data/fonts/mplus-outline-fonts { });



  noto-fonts-cjk-serif-static = callPackage ../by-name/no/noto-fonts-cjk-serif/package.nix {