From a699e5e1ef62bce7722a609d54d313875b1ffb20 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 25 Jul 2022 11:05:15 +0200 Subject: [PATCH] oranchelo-icon-theme: 0.8.0.1 -> 0.9.0 https://github.com/OrancheloTeam/oranchelo-icon-theme/releases/tag/v0.9.0 We use the upstream Makefile instead of copying the files manually in the installPhase. --- .../icons/oranchelo-icon-theme/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/data/icons/oranchelo-icon-theme/default.nix b/pkgs/data/icons/oranchelo-icon-theme/default.nix index 5c93acbb10af..b676b5956c73 100644 --- a/pkgs/data/icons/oranchelo-icon-theme/default.nix +++ b/pkgs/data/icons/oranchelo-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "oranchelo-icon-theme"; - version = "0.8.0.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "OrancheloTeam"; repo = pname; - rev = "096c8c8d550ac9a85f5f34f3f30243e6f198df2d"; - sha256 = "sha256-TKi42SA33pGKdrPtGTpvxFbOP+5N93Y4BvO4CRTveLM="; + rev = "v${version}"; + sha256 = "sha256-IDsZj/X9rFSdDpa3bL6IPEPCRe5GustPteDxSbfz+SA="; }; nativeBuildInputs = [ @@ -22,9 +22,18 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; - installPhase = '' - mkdir -p $out/share/icons - cp -r $Oranchelo* $out/share/icons/ + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + ]; + + postInstall = '' + # space in icon name causes gtk-update-icon-cache to fail + mv "$out/share/icons/Oranchelo/apps/scalable/ grsync.svg" "$out/share/icons/Oranchelo/apps/scalable/grsync.svg" + + for theme in $out/share/icons/*; do + gtk-update-icon-cache "$theme" + done ''; meta = with lib; {