Merge pull request #42308 from romildo/upd.moka-icon-theme

moka-icon-theme: 5.3.6 -> 5.4.0, faba-icon-theme: 2016-09-13 -> 4.3
This commit is contained in:
Jörg Thalheim 2018-07-03 13:27:55 +01:00 committed by GitHub
commit 352b957a9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 18 deletions

View File

@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
description = "Arc icon theme"; description = "Arc icon theme";
homepage = https://github.com/horst3180/arc-icon-theme; homepage = https://github.com/horst3180/arc-icon-theme;
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.all; # moka-icon-theme dependency is restricted to linux
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ]; maintainers = with maintainers; [ romildo ];
}; };
} }

View File

@ -1,25 +1,23 @@
{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme, gtk3 }: { stdenv, fetchFromGitHub, meson, ninja, gtk3, elementary-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${package-name}-${version}"; name = "${package-name}-${version}";
package-name = "faba-icon-theme"; package-name = "faba-icon-theme";
version = "2016-09-13"; version = "4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "moka-project"; owner = "moka-project";
repo = package-name; repo = package-name;
rev = "00431894bce5fb1b8caccaee064788996be228a7"; rev = "v${version}";
sha256 = "0hif030pd4w3s851k0s65w0mf2pik10ha25ycpsv91gpbgarqcns"; sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
}; };
nativeBuildInputs = [ autoreconfHook elementary-icon-theme gtk3 ]; nativeBuildInputs = [ meson ninja gtk3 elementary-icon-theme ];
postPatch = '' postPatch = ''
substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out patchShebangs meson/post_install.py
''; '';
postFixup = "gtk-update-icon-cache $out/share/icons/Faba";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A sexy and modern icon theme with Tango influences"; description = "A sexy and modern icon theme with Tango influences";
homepage = https://snwh.org/moka; homepage = https://snwh.org/moka;

View File

@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
description = "The full set of Faba monochrome panel icons"; description = "The full set of Faba monochrome panel icons";
homepage = https://snwh.org/moka; homepage = https://snwh.org/moka;
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.all; # moka-icon-theme dependency is restricted to linux
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ]; maintainers = with maintainers; [ romildo ];
}; };
} }

View File

@ -1,30 +1,29 @@
{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme, gtk3 }: { stdenv, fetchFromGitHub, meson, ninja, gtk3, faba-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "moka-icon-theme"; pname = "moka-icon-theme";
version = "5.3.6"; version = "5.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "snwh"; owner = "snwh";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "17f8k8z8xvib4hkxq0cw9j7bhdpqpv5frrkyc4sbyildcbavzzbr"; sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd";
}; };
nativeBuildInputs = [ autoreconfHook faba-icon-theme gtk3 ]; nativeBuildInputs = [ meson ninja gtk3 faba-icon-theme ];
postPatch = '' postPatch = ''
substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out patchShebangs meson/post_install.py
''; '';
postFixup = "gtk-update-icon-cache $out/share/icons/Moka";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; description = "An icon theme designed with a minimal flat style using simple geometry and bright colours";
homepage = https://snwh.org/moka; homepage = https://snwh.org/moka;
license = with licenses; [ cc-by-sa-40 gpl3 ]; license = with licenses; [ cc-by-sa-40 gpl3 ];
platforms = platforms.all; # darwin cannot deal with file names differing only in case
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ]; maintainers = with maintainers; [ romildo ];
}; };
} }