From 98d1bb9e6e63a027123d02d6f21005947cd2a515 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 1 Nov 2016 14:21:23 +0100
Subject: [PATCH 1/2] tinyxml-2: 3.0.0 -> 4.0.1

---
 .../libraries/tinyxml-2/default.nix           | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix
index 6c77f6a004a..9011d33e922 100644
--- a/pkgs/development/libraries/tinyxml-2/default.nix
+++ b/pkgs/development/libraries/tinyxml-2/default.nix
@@ -1,15 +1,22 @@
-{ stdenv, fetchurl, cmake }:
-let version = "3.0.0";
-in stdenv.mkDerivation rec {
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
   name = "tinyxml-2-${version}";
-  src = fetchurl {
-    url = "https://github.com/leethomason/tinyxml2/archive/${version}.tar.gz";
-    sha256 = "0ispg7ngkry8vhzzawbq42y8gkj53xjipkycw0rkhh487ras32hj";
+  version = "4.0.1";
+
+  src = fetchFromGitHub {
+    repo = "tinyxml2";
+    owner = "leethomason";
+    rev = version;
+    sha256 = "1a0skfi8rzk53qcxbv88qlvhlqzvsvg4hm20dnx4zw7vrn6anr9y";
   };
 
   nativeBuildInputs = [ cmake ];
 
   meta = {
+    description = "A simple, small, efficient, C++ XML parser";
+    homepage = http://www.grinninglizard.com/tinyxml2/index.html;
     platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.zlib;
   };
 }

From 0ee7d1ea4ee5d3d169bfb7940c105790d3c6b388 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 1 Nov 2016 14:25:39 +0100
Subject: [PATCH 2/2] encfs: 1.8.1 -> 1.9.1

Packaging changes
- Uses cmake
- Removes depends on rlog and boost, uses tinyxml to parse xml

Note that the encfssh utility is disabled, it requires patching to
work (and didn't work in previous versions of the package, either).
Better to leave it unusable until fixed.
---
 pkgs/tools/filesystems/encfs/default.nix | 27 +++++++++++++-----------
 pkgs/top-level/all-packages.nix          |  4 +++-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index d0d9fa02178..518edbb3ea4 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -1,31 +1,34 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl
-, pkgconfig, rlog }:
+{ stdenv, fetchFromGitHub
+, cmake, pkgconfig, perl
+, gettext, fuse, openssl, tinyxml2
+}:
 
 stdenv.mkDerivation rec {
   name = "encfs-${version}";
-  version = "1.8.1";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
-    sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb";
+    sha256 = "1pyldd802db987m13jfmy491mp8mnsv2mwki0ra4wbnngbqgalhv";
     rev = "v${version}";
     repo = "encfs";
     owner = "vgough";
   };
 
-  buildInputs = [ boost fuse openssl rlog ];
-  nativeBuildInputs = [ autoreconfHook perl pkgconfig ];
+  buildInputs = [ gettext fuse openssl tinyxml2 ];
+  nativeBuildInputs = [ cmake pkgconfig perl ];
 
-  configureFlags = [
-    "--with-boost-serialization=boost_wserialization"
-    "--with-boost-filesystem=boost_filesystem"
-  ];
+  cmakeFlags =
+    [ "-DUSE_INTERNAL_TINYXML=OFF"
+      "-DBUILD_SHARED_LIBS=ON"
+      "-DINSTALL_LIBENCFS=ON"
+    ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
+    description = "An encrypted filesystem in user-space via FUSE";
     homepage = https://vgough.github.io/encfs;
-    description = "Provides an encrypted filesystem in user-space via FUSE";
-    license = licenses.lgpl2;
+    license = with licenses; [ gpl3 lgpl3 ];
     maintainers = with maintainers; [ nckx ];
     platforms = with platforms; linux;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 262e4e058b3..9a4614b6e5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1517,7 +1517,9 @@ in
 
   enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { };
 
-  encfs = callPackage ../tools/filesystems/encfs { };
+  encfs = callPackage ../tools/filesystems/encfs {
+    tinyxml2 = tinyxml-2;
+  };
 
   enscript = callPackage ../tools/text/enscript { };