From 1a525eeab1766c098460d5e12d68098c858c301d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 12 Apr 2018 18:56:41 -0300
Subject: [PATCH] numix-solarized: 20160919 -> 20170810

---
 .../default.nix                               | 30 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)
 rename pkgs/misc/themes/{gtk3/numix-solarized-gtk-theme => numix-solarized}/default.nix (51%)

diff --git a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix b/pkgs/misc/themes/numix-solarized/default.nix
similarity index 51%
rename from pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix
rename to pkgs/misc/themes/numix-solarized/default.nix
index 4ede14d3bb39..3c81e4308ca9 100644
--- a/pkgs/misc/themes/gtk3/numix-solarized-gtk-theme/default.nix
+++ b/pkgs/misc/themes/numix-solarized/default.nix
@@ -1,26 +1,40 @@
-{ stdenv, fetchFromGitHub, sass, glib, gdk_pixbuf }:
+{ stdenv, fetchFromGitHub, python3, sass, glib, gdk_pixbuf, libxml2,
+  inkscape, optipng, gtk-engine-murrine
+}:
 
 stdenv.mkDerivation rec {
-  version = "20160919";
+  version = "20170810";
   name = "numix-solarized-gtk-theme-${version}";
 
   src = fetchFromGitHub {
     owner = "Ferdi265";
     repo = "numix-solarized-gtk-theme";
     rev = version;
-    sha256 = "0243w918ycmf9vnkzfvwnrxz9zc6xxk7167h8ywxj901pqy59kad";
+    sha256 = "0l4xvsiyg15kp6xwpvm3jckxyhr1lxd678lkhrcyf40n7rd4xinl";
   };
 
+  nativeBuildInputs = [ python3 sass glib gdk_pixbuf libxml2 inkscape optipng ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
   postPatch = ''
-    substituteInPlace Makefile --replace \
-      'INSTALL_DIR=$(DESTDIR)/usr/share/themes' "INSTALL_DIR=$out/share/themes"
     patchShebangs .
+    substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
+    substituteInPlace scripts/render-assets.sh \
+      --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \
+      --replace /usr/bin/optipng ${optipng}/bin/optipng
   '';
 
-  buildInputs = [sass glib gdk_pixbuf];
+  buildPhase = "true";
+
+  installPhase = ''
+    for theme in *.colors; do
+      make THEME="''${theme/.colors/}" install
+    done
+  '';
 
   meta = with stdenv.lib; {
-    description = "GTK3.20-compatible version of bitterologist's Numix Solarized from deviantart";
+    description = "Solarized versions of Numix GTK2 and GTK3 theme";
     longDescription = ''
       This is a fork of the Numix GTK theme that replaces the colors of the theme
       and icons to use the solarized theme with a solarized green accent color.
@@ -29,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme;
     downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases;
     license = licenses.gpl3;
-    maintainers = [ maintainers.offline ];
     platforms = platforms.linux;
+    maintainers = [ maintainers.offline ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff147c496a69..522a013f235d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19607,7 +19607,7 @@ with pkgs;
 
   numix-gtk-theme = callPackage ../misc/themes/numix { };
 
-  numix-solarized-gtk-theme = callPackage ../misc/themes/gtk3/numix-solarized-gtk-theme {  };
+  numix-solarized-gtk-theme = callPackage ../misc/themes/numix-solarized { };
 
   numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { };