From 06f4e69de0a26143f3e4bf7f58815627a4e193e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 09:29:46 -0300 Subject: [PATCH] numix-icon-theme-circle: add missing parent icon themes Also: - add runHook calls - move postFixup actions to installPhase --- .../data/icons/numix-icon-theme-circle/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index a22b97ec1e71..3c991cf1fc83 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -13,18 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - buildInputs = [ numix-icon-theme ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ numix-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' - install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ - ''; + runHook preInstall + + mkdir -p $out/share/icons + cp -a Numix-Circle{,-Light} $out/share/icons - postFixup = '' for panel in $out/share/icons/*/*/panel; do ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel done @@ -32,6 +30,8 @@ stdenv.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + runHook postInstall ''; meta = with stdenv.lib; {