about summary refs log tree commit diff
path: root/pkgs/tools/filesystems/encfs
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-11-01 14:25:39 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2016-11-01 15:57:29 +0100
commit0ee7d1ea4ee5d3d169bfb7940c105790d3c6b388 (patch)
tree2fa380a1c862ace5c273d3592da727eb94a63c81 /pkgs/tools/filesystems/encfs
parent98d1bb9e6e63a027123d02d6f21005947cd2a515 (diff)
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.
Diffstat (limited to 'pkgs/tools/filesystems/encfs')
-rw-r--r--pkgs/tools/filesystems/encfs/default.nix27
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index d0d9fa0217869..518edbb3ea4e6 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;
   };