diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-12 17:24:53 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 17:24:53 -0600 |
| commit | a83dc7e3314d84fe09cd2d4ef315aa20d0824e25 (patch) | |
| tree | 27815566fef9776c38f0c6ad9b6a520e46840573 /pkgs/data | |
| parent | 964d01a5caa788425a4936f097bf7aa0ed62bb4b (diff) | |
| parent | a49fbb6a059caca41a49da7c84e484b9bc17d8fb (diff) | |
| download | nixlib-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar nixlib-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar.gz nixlib-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar.bz2 nixlib-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar.lz nixlib-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar.xz nixlib-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar.zst nixlib-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.zip | |
Merge pull request #47690 from romildo/fix.icon-cache
build GTK icon caches for some packages
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/icons/maia-icon-theme/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/data/icons/paper-icon-theme/default.nix | 5 |
2 files changed, 26 insertions, 9 deletions
diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 82aafca11f4f..7b4ed7a66809 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, gtk3, kdeFrameworks }: +{ stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "maia-icon-theme-${version}"; - version = "2016-09-16"; + version = "2018-02-24"; - src = fetchFromGitHub { - owner = "manjaro"; - repo = "artwork-maia"; - rev = "f6718cd9c383adb77af54b694c47efa4d581f5b5"; - sha256 = "0f9l3k9abgg8islzddrxgbxaw6vbai5bvz5qi1v2fzir7ykx7bgj"; + src = fetchFromGitLab { + domain = "gitlab.manjaro.org"; + group = "artwork"; + owner = "themes"; + repo = "maia"; + rev = "b61312cc80cb9d12b0d8a55b3e61668eb6b77d2d"; + sha256 = "1g98snlh96z4sqw9sfd7fxgamh45pcj3lh1kcmng7mirvrcn2pam"; }; nativeBuildInputs = [ @@ -19,10 +21,20 @@ stdenv.mkDerivation rec { kdeFrameworks.kwindowsystem ]; + buildInputs = [ + hicolor-icon-theme + ]; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + meta = with stdenv.lib; { description = "Icons based on Breeze and Super Flat Remix"; - homepage = https://github.com/manjaro/artwork-maia; - license = licenses.free; # https://github.com/manjaro/artwork-maia/issues/27 + homepage = https://gitlab.manjaro.org/artwork/themes/maia; + license = licenses.lgpl3; maintainers = with maintainers; [ mounium ]; platforms = platforms.all; }; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index b16c9b076824..de808e44ea6c 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + postInstall = '' + # The cache for Paper-Mono-Dark is missing + gtk-update-icon-cache "$out"/share/icons/Paper-Mono-Dark; + ''; + meta = with stdenv.lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; homepage = https://snwh.org/paper; |