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.

+18 -13
+15 -12
pkgs/tools/filesystems/encfs/default.nix
··· 1 - { stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl 2 - , pkgconfig, rlog }: 1 + { stdenv, fetchFromGitHub 2 + , cmake, pkgconfig, perl 3 + , gettext, fuse, openssl, tinyxml2 4 + }: 3 5 4 6 stdenv.mkDerivation rec { 5 7 name = "encfs-${version}"; 6 - version = "1.8.1"; 8 + version = "1.9.1"; 7 9 8 10 src = fetchFromGitHub { 9 - sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb"; 11 + sha256 = "1pyldd802db987m13jfmy491mp8mnsv2mwki0ra4wbnngbqgalhv"; 10 12 rev = "v${version}"; 11 13 repo = "encfs"; 12 14 owner = "vgough"; 13 15 }; 14 16 15 - buildInputs = [ boost fuse openssl rlog ]; 16 - nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; 17 + buildInputs = [ gettext fuse openssl tinyxml2 ]; 18 + nativeBuildInputs = [ cmake pkgconfig perl ]; 17 19 18 - configureFlags = [ 19 - "--with-boost-serialization=boost_wserialization" 20 - "--with-boost-filesystem=boost_filesystem" 21 - ]; 20 + cmakeFlags = 21 + [ "-DUSE_INTERNAL_TINYXML=OFF" 22 + "-DBUILD_SHARED_LIBS=ON" 23 + "-DINSTALL_LIBENCFS=ON" 24 + ]; 22 25 23 26 enableParallelBuilding = true; 24 27 25 28 meta = with stdenv.lib; { 29 + description = "An encrypted filesystem in user-space via FUSE"; 26 30 homepage = https://vgough.github.io/encfs; 27 - description = "Provides an encrypted filesystem in user-space via FUSE"; 28 - license = licenses.lgpl2; 31 + license = with licenses; [ gpl3 lgpl3 ]; 29 32 maintainers = with maintainers; [ nckx ]; 30 33 platforms = with platforms; linux; 31 34 };
+3 -1
pkgs/top-level/all-packages.nix
··· 1517 1517 1518 1518 enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; 1519 1519 1520 - encfs = callPackage ../tools/filesystems/encfs { }; 1520 + encfs = callPackage ../tools/filesystems/encfs { 1521 + tinyxml2 = tinyxml-2; 1522 + }; 1521 1523 1522 1524 enscript = callPackage ../tools/text/enscript { }; 1523 1525