From 9752218d40a00ae558c6710a1043fa713f106f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 22 May 2016 05:58:57 -0300
Subject: [PATCH 1/3] paper-gtk-theme: moved from "pkgs/misc/themes/gtk3/" to
 "pkgs/misc/themes/"

---
 pkgs/misc/themes/{gtk3 => }/paper-gtk-theme/default.nix | 0
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/misc/themes/{gtk3 => }/paper-gtk-theme/default.nix (100%)

diff --git a/pkgs/misc/themes/gtk3/paper-gtk-theme/default.nix b/pkgs/misc/themes/paper-gtk-theme/default.nix
similarity index 100%
rename from pkgs/misc/themes/gtk3/paper-gtk-theme/default.nix
rename to pkgs/misc/themes/paper-gtk-theme/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fda55102d7f..2da9f2324223 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2799,7 +2799,7 @@ in
 
   pamtester = callPackage ../tools/security/pamtester { };
 
-  paper-gtk-theme = callPackage ../misc/themes/gtk3/paper-gtk-theme { };
+  paper-gtk-theme = callPackage ../misc/themes/paper-gtk-theme { };
 
   par2cmdline = callPackage ../tools/networking/par2cmdline { };
 

From 7e390822d2cb30f48e9518f2359125ab3162b22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 22 May 2016 10:39:02 -0300
Subject: [PATCH 2/3] paper-gtk-theme: 6a5f14cfe697b0a829456a1fd560acdcddc6043f
 -> 2016-05-18

---
 pkgs/misc/themes/paper-gtk-theme/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/themes/paper-gtk-theme/default.nix b/pkgs/misc/themes/paper-gtk-theme/default.nix
index c7cf3a871b58..ccff20dd929d 100644
--- a/pkgs/misc/themes/paper-gtk-theme/default.nix
+++ b/pkgs/misc/themes/paper-gtk-theme/default.nix
@@ -1,29 +1,31 @@
-{ stdenv, fetchFromGitHub, gtk }:
+{ stdenv, fetchFromGitHub, autoreconfHook, gtk_engines }:
 
 stdenv.mkDerivation rec {
-  version = "6a5f14cfe697b0a829456a1fd560acdcddc6043f";
+  version = "2016-05-18";
   name = "paper-gtk-theme-${version}";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = "paper-gtk-theme";
-    sha256 = "0kyn3a6sq0z22vds6szl630jv20pjskjbdg0wc8abxzwg0vwxc5m";
-    rev = version;
+    rev = "5113d58dc64de70fcc75ad2d6d05c8c8dae2de7f";
+    sha256 = "1j9l50iyvadpqsq5v14zgml24jgraajr5kl9ji0ar62nlak2bi8s";
   };
 
-  dontBuild = true;
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ gtk_engines ];
+
   installPhase = ''
-    mkdir -p $out/share/themes/Paper/
-    cp -r ./Paper/ $out/share/themes/
+    make install DESTDIR="$out"
   '';
 
   preferLocalBuild = true;
 
   meta = with stdenv.lib; {
     description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth";
-    homepage = "http://snwh.org/paper/";
+    homepage = "http://snwh.org/paper";
     license = licenses.gpl3;
-    maintainers = [ maintainers.simonvandel ];
+    maintainers = [ maintainers.simonvandel maintainers.romildo ];
     platforms = platforms.linux;
   };
 }

From cb67a0f150df1ccc88129e353f764af5f2420404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 22 May 2016 10:41:15 -0300
Subject: [PATCH 3/3] paper-icon-theme: init at 2016-05-21

---
 pkgs/data/icons/paper-icon-theme/default.nix | 28 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/data/icons/paper-icon-theme/default.nix

diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
new file mode 100644
index 000000000000..731d6158304b
--- /dev/null
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "${package-name}-${version}";
+  package-name = "paper-icon-theme";
+  version = "2016-05-21";
+
+  src = fetchFromGitHub {
+    owner = "snwh";
+    repo = package-name;
+    rev = "f2a34cab78df0fa7db5a10e93e633953cb7c1eb7";
+    sha256 = "0pk848jbskkwz7im73119hcrcyr5nim37jcdrhqf4cwrshmbcacq";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  installPhase = ''
+    make install DESTDIR="$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Modern icon theme designed around bold colours and simple geometric shapes";
+    homepage = http://snwh.org/paper;
+    license = with licenses; [ cc-by-sa-40 lgpl3 ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2da9f2324223..207f2e445e98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11588,6 +11588,8 @@ in
 
   opensans-ttf = callPackage ../data/fonts/opensans-ttf { };
 
+  paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
+
   pecita = callPackage ../data/fonts/pecita {};
 
   paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {};