Unverified Commit 489d27a2 authored by José Romildo Malaquias's avatar José Romildo Malaquias Committed by GitHub
Browse files

Merge pull request #264845 from romildo/upd.papirus-icon-theme 

papirus-icon-theme: 20230901 -> 20231101
parents 87cc0698 c4106756

pkgs/data/icons/papirus-icon-theme/default.nix

+25 −8
Original line number Diff line number Diff line 
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }:

{ lib

, stdenvNoCC

, fetchFromGitHub

, gtk3

, breeze-icons

, elementary-icon-theme

, hicolor-icon-theme

, papirus-folders

, color ? null

, withElementary ? false

, gitUpdater

}:



stdenvNoCC.mkDerivation rec {

  pname = "papirus-icon-theme";

  version = "20230901";

  version = "20231101";



  src = fetchFromGitHub {

    owner = "PapirusDevelopmentTeam";

    repo = pname;

    rev = version;

    hash = "sha256-FcTNZgCdPlYjpheA3PfZBR3apOkDi4+RafQtXdqchGI=";

    hash = "sha256-0ooHuMqGzlMLVTR/u+kCJLibfqTAtq662EG8i3JIzPA=";

  };



  nativeBuildInputs = [ gtk3 papirus-folders ];

  nativeBuildInputs = [

    gtk3

    papirus-folders

  ];



  propagatedBuildInputs = [

    pantheon.elementary-icon-theme

    breeze-icons

    gnome-icon-theme

    hicolor-icon-theme

  ] ++ lib.optional withElementary [

    elementary-icon-theme

  ];



  dontDropIconThemeCache = true;



  installPhase = ''

    runHook preInstall



    mkdir -p $out/share/icons

    mv {,e}Papirus* $out/share/icons

    mv ${lib.optionalString withElementary "{,e}"}Papirus* $out/share/icons



    for theme in $out/share/icons/*; do

      ${lib.optionalString (color != null) "${papirus-folders}/bin/papirus-folders -t $theme -o -C ${color}"}
@@ -35,8 +50,10 @@ stdenvNoCC.mkDerivation rec { 
    runHook postInstall

  '';



  passthru.updateScript = gitUpdater { };



  meta = with lib; {

    description = "Papirus icon theme";

    description = "Pixel perfect icon theme for Linux";

    homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme";

    license = licenses.gpl3Only;

    # darwin gives hash mismatch in source, probably because of file names differing only in case

pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { 


  dontDropIconThemeCache = true;



  postFixup = ''

  preFixup = ''

    for theme in $out/share/icons/*; do

      gtk-update-icon-cache $theme

    done

pkgs/top-level/all-packages.nix

+3 −0
Original line number Diff line number Diff line
@@ -29253,6 +29253,8 @@ with pkgs; 














  eduli = callPackage ../data/fonts/eduli { };



























  epapirus-icon-theme = papirus-icon-theme.override { withElementary = true; };



























  moeli = eduli;





























  edusong = callPackage ../data/fonts/edusong { };










@@ -29788,6 +29790,7 @@ with pkgs;













  paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };





























  papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme {













    inherit (pantheon) elementary-icon-theme;















    inherit (plasma5Packages) breeze-icons;















  };