From ce1a58e5ac1e7069758d8ab77f95f6c0a01a205f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 20 Jun 2018 16:58:28 -0300 Subject: [PATCH 1/3] moka-icon-theme: 5.3.6 -> 5.4.0 - Update to version 5.4.0 - Build with meson - Remove explicitly building of the icon cache, as it is built automatically now --- pkgs/data/icons/moka-icon-theme/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index f3180db54dc..e9d5e6fb063 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, faba-icon-theme, gtk3 }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3, faba-icon-theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "moka-icon-theme"; - version = "5.3.6"; + version = "5.4.0"; src = fetchFromGitHub { owner = "snwh"; repo = pname; rev = "v${version}"; - sha256 = "17f8k8z8xvib4hkxq0cw9j7bhdpqpv5frrkyc4sbyildcbavzzbr"; + sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"; }; - nativeBuildInputs = [ autoreconfHook faba-icon-theme gtk3 ]; + nativeBuildInputs = [ meson ninja gtk3 faba-icon-theme ]; 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; { description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; homepage = https://snwh.org/moka; From fba3a1076c070f41faffccc911207932370cf502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 29 Jun 2018 12:04:48 -0300 Subject: [PATCH 2/3] faba-icon-theme: 2016-09-13 -> 4.3 --- pkgs/data/icons/faba-icon-theme/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index fdad4f0f46d..e9d9efcfcb0 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, elementary-icon-theme, gtk3 }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3, elementary-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "faba-icon-theme"; - version = "2016-09-13"; + version = "4.3"; src = fetchFromGitHub { owner = "moka-project"; repo = package-name; - rev = "00431894bce5fb1b8caccaee064788996be228a7"; - sha256 = "0hif030pd4w3s851k0s65w0mf2pik10ha25ycpsv91gpbgarqcns"; + rev = "v${version}"; + sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"; }; - nativeBuildInputs = [ autoreconfHook elementary-icon-theme gtk3 ]; + nativeBuildInputs = [ meson ninja gtk3 elementary-icon-theme ]; 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; { description = "A sexy and modern icon theme with Tango influences"; homepage = https://snwh.org/moka; From ef7c6e081d3b81cc5f000f867dd0e72d110f570d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 2 Jul 2018 17:32:30 -0300 Subject: [PATCH 3/3] moka-icon-theme, arc-icon-theme, faba-mono-icons: restrict platforms to linux --- pkgs/data/icons/arc-icon-theme/default.nix | 3 ++- pkgs/data/icons/faba-mono-icons/default.nix | 3 ++- pkgs/data/icons/moka-icon-theme/default.nix | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 84bf45a52bb..6529e5c571c 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { description = "Arc icon theme"; homepage = https://github.com/horst3180/arc-icon-theme; license = licenses.gpl3; - platforms = platforms.all; + # moka-icon-theme dependency is restricted to linux + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index bdb6f651e6a..a4ffefe1f26 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { description = "The full set of Faba monochrome panel icons"; homepage = https://snwh.org/moka; license = licenses.gpl3; - platforms = platforms.all; + # moka-icon-theme dependency is restricted to linux + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index e9d5e6fb063..2b4bb5d67c3 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; homepage = https://snwh.org/moka; 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 ]; }; }