public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

encfs: 1.8.1 -> 1.9.1

Browse Source 
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.
This commit is contained in:
Joachim Fasting 2016-11-01 14:25:39 +01:00
parent 98d1bb9e6e
commit 0ee7d1ea4e
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/tools/filesystems/encfs/default.nix
View File

@ -1,31 +1,34 @@
{ stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl { stdenv, fetchFromGitHub
, pkgconfig, rlog }: , cmake, pkgconfig, perl
, gettext, fuse, openssl, tinyxml2
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "encfs-${version}"; name = "encfs-${version}";
version = "1.8.1"; version = "1.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb"; sha256 = "1pyldd802db987m13jfmy491mp8mnsv2mwki0ra4wbnngbqgalhv";
rev = "v${version}"; rev = "v${version}";
repo = "encfs"; repo = "encfs";
owner = "vgough"; owner = "vgough";
}; };
buildInputs = [ boost fuse openssl rlog ]; buildInputs = [ gettext fuse openssl tinyxml2 ];
nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig perl ];
configureFlags = [ cmakeFlags =
"--with-boost-serialization=boost_wserialization" [ "-DUSE_INTERNAL_TINYXML=OFF"
"--with-boost-filesystem=boost_filesystem" "-DBUILD_SHARED_LIBS=ON"
"-DINSTALL_LIBENCFS=ON"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An encrypted filesystem in user-space via FUSE";
homepage = https://vgough.github.io/encfs; homepage = https://vgough.github.io/encfs;
description = "Provides an encrypted filesystem in user-space via FUSE"; license = with licenses; [ gpl3 lgpl3 ];
license = licenses.lgpl2;
maintainers = with maintainers; [ nckx ]; maintainers = with maintainers; [ nckx ];
platforms = with platforms; linux; platforms = with platforms; linux;
}; };

4
pkgs/top-level/all-packages.nix
View File

@ -1517,7 +1517,9 @@ in
enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; 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 { }; enscript = callPackage ../tools/text/enscript { };