From fc7c571dcee83881ebda2fea63d8178710a6bd44 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <loskutov@google.com>
Date: Sun, 25 Sep 2016 23:15:32 -0400
Subject: [PATCH 1/3] libxml++: add 3.0.0

---
 pkgs/development/libraries/libxmlxx/v3.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/libxmlxx/v3.nix

diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
new file mode 100644
index 00000000000..e665cfdea6f
--- /dev/null
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl
+, pkgconfig, libxml2, glibmm, perl }:
+stdenv.mkDerivation rec {
+  name = "libxml++-3.0.0";
+  src = fetchurl {
+    url = "mirror://gnome/sources/libxml++/3.0/${name}.tar.xz";
+    sha256 = "0lkrajbdys5f6w6qwfijih3hnbk4c6809qx2mmxkb7bj2w269wrg";
+  };
+
+  buildInputs = [ pkgconfig glibmm perl ];
+
+  propagatedBuildInputs = [ libxml2 ];
+
+  meta = {
+    homepage = http://libxmlplusplus.sourceforge.net/;
+    description = "C++ wrapper for the libxml2 XML parser library, version 3";
+    license = "LGPLv2+";
+    maintainers = with stdenv.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fb51b69a7e..78a273a0397 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8893,6 +8893,7 @@ in
   };
 
   libxmlxx = callPackage ../development/libraries/libxmlxx { };
+  libxmlxx3 = callPackage ../development/libraries/libxmlxx/v3.nix { };
 
   libxmp = callPackage ../development/libraries/libxmp { };
 

From bbaa851bf13d56f16f7dbef3a224f551258e9e54 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <loskutov@google.com>
Date: Tue, 27 Sep 2016 01:34:40 -0400
Subject: [PATCH 2/3] libxmlxx3: refactor to match libxmlxx

---
 pkgs/development/libraries/libxmlxx/v3.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
index e665cfdea6f..0db3870b05a 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -1,20 +1,26 @@
-{ stdenv, fetchurl
-, pkgconfig, libxml2, glibmm, perl }:
+{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }:
+
 stdenv.mkDerivation rec {
-  name = "libxml++-3.0.0";
+  name = "libxml++-${maj_ver}.${min_ver}";
+  maj_ver = "3.0";
+  min_ver = "0";
+
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml++/3.0/${name}.tar.xz";
+    url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz";
     sha256 = "0lkrajbdys5f6w6qwfijih3hnbk4c6809qx2mmxkb7bj2w269wrg";
   };
 
-  buildInputs = [ pkgconfig glibmm perl ];
+  nativeBuildInputs = [ pkgconfig perl ];
+
+  buildInputs = [ glibmm ];
 
   propagatedBuildInputs = [ libxml2 ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libxmlplusplus.sourceforge.net/;
     description = "C++ wrapper for the libxml2 XML parser library, version 3";
-    license = "LGPLv2+";
-    maintainers = with stdenv.maintainers; [ ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ];
   };
 }

From 8843c40b1ae4c7befd0f06028f1d48d6c645f62a Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <loskutov@google.com>
Date: Tue, 27 Sep 2016 01:41:01 -0400
Subject: [PATCH 3/3] libxmlxx3: add myself as a maintainer

---
 lib/maintainers.nix                        | 1 +
 pkgs/development/libraries/libxmlxx/v3.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0a08b288562..16fca039e2e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -227,6 +227,7 @@
   linquize = "Linquize <linquize@yahoo.com.hk>";
   linus = "Linus Arver <linusarver@gmail.com>";
   lnl7 = "Daiderd Jordan <daiderd@gmail.com>";
+  loskutov = "Ignat Loskutov <ignat.loskutov@gmail.com>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>";
   lsix = "Lancelot SIX <lsix@lancelotsix.com>";
diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
index 0db3870b05a..e9b08609f23 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "C++ wrapper for the libxml2 XML parser library, version 3";
     license = licenses.lgpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ loskutov ];
   };
 }