From 50795f37c614a42aa4bc97b0851302c208af9c44 Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Tue, 2 Oct 2018 18:38:28 -0300
Subject: maia-icon-theme: 2016-09-16 -> 2018-02-24

- Update to newer revision
- Update homepage
- Update src
- Update license
- Add dependency on hicolor-icon-theme
- Build GTK icon cache
---
 pkgs/data/icons/maia-icon-theme/default.nix | 30 ++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'pkgs/data')

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;
   };
-- 
cgit 1.4.1


From 3a7ae58f9662c16709c61d90c94fd909de6f8bb7 Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Tue, 2 Oct 2018 18:42:18 -0300
Subject: paper-icon-theme: build GTK icon cache for Paper-Mono-Dark

---
 pkgs/data/icons/paper-icon-theme/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'pkgs/data')

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;
-- 
cgit 1.4.1