git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115000 from bloomvdomino/kora-icon-theme

kora-icon-theme: 1.4.1 -> 1.4.2

commit9eb313141680d1c42bd8223e6ec92bc914dc7029 authorSandro <sandro.jaeckel@gmail.com> dateSun 21 Mar 2021, 20:51 (6 years ago) parent1790a507e16a5c
2 files changed+10−5
pkgs/data/icons/kora-icon-theme/default.nix+9−5 pkgs/top-level/all-packages.nix+1
pkgs/data/icons/kora-icon-theme/default.nix+9−5
@@ -1,14 +1,14 @@
1−{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }:
1+{ lib, stdenv, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }:
22
33stdenv.mkDerivation rec {
44 pname = "kora-icon-theme";
5− version = "1.4.1";
5+ version = "1.4.2";
66
77 src = fetchFromGitHub {
88 owner = "bikass";
99 repo = "kora";
1010 rev = "v${version}";
11− sha256 = "sha256-YGhusal8g/UXMqrQvj147OScg51uNABTMIXxVXvnpKY=";
11+ sha256 = "1qnqz0h2c5kilch3308l8nfshgsrkllyysvqn0mxy70iziw895rv";
1212 };
1313
1414 nativeBuildInputs = [
@@ -16,20 +16,24 @@ stdenv.mkDerivation rec {
1616 ];
1717
1818 propagatedBuildInputs = [
19+ adwaita-icon-theme
1920 breeze-icons
20− gnome-icon-theme
2121 hicolor-icon-theme
2222 ];
2323
2424 dontDropIconThemeCache = true;
2525
2626 installPhase = ''
27+ runHook preInstall
28+
2729 mkdir -p $out/share/icons
2830 mv kora* $out/share/icons/
2931
3032 for theme in $out/share/icons/*; do
31− gtk-update-icon-cache $theme
33+ gtk-update-icon-cache -f $theme
3234 done
35+
36+ runHook postInstall
3337 '';
3438
3539 meta = with lib; {
pkgs/top-level/all-packages.nix+1
@@ -20919,6 +20919,7 @@ in
2091920919 kopia = callPackage ../tools/backup/kopia { };
2092020920
2092120921 kora-icon-theme = callPackage ../data/icons/kora-icon-theme {
20922+ inherit (gnome3) adwaita-icon-theme;
2092220923 inherit (libsForQt5.kdeFrameworks) breeze-icons;
2092320924 };
2092420925