Merge pull request #78429 from thefloweringash/llfuse-darwin

pythonPackages.llfuse: darwin support, use in borgbackup
This commit is contained in:
Daiderd Jordan 2020-01-25 15:52:36 +01:00 committed by GitHub
commit 6e6c16f90e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 7 deletions

View file

@ -1,7 +1,11 @@
{ stdenv, fetchurl, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
, contextlib2
{ stdenv, fetchurl, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
, contextlib2, osxfuse
}:
let
inherit (stdenv.lib) optionals optionalString;
in
buildPythonPackage rec {
pname = "llfuse";
version = "1.3.6";
@ -11,14 +15,29 @@ buildPythonPackage rec {
sha256 = "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii";
};
patches = [
# https://github.com/python-llfuse/python-llfuse/pull/23 (2 commits)
(fetchpatch {
url = "https://github.com/python-llfuse/python-llfuse/commit/7579b0e626da1a7882b13caedcdbd4a834702e94.diff";
sha256 = "0vpybj4k222h20lyn0q7hz86ziqlapqs5701cknw8d11jakbhhb0";
})
(fetchpatch {
url = "https://github.com/python-llfuse/python-llfuse/commit/438c00ab9e10d6c485bb054211c01b7f8524a736.diff";
sha256 = "1zhb05b7k3c9mjqshy9in8yzpbihy7f33x1myq5kdjip1k50cwrn";
})
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fuse ];
checkInputs = [ pytest attr which ];
buildInputs =
optionals stdenv.isLinux [ fuse ]
++ optionals stdenv.isDarwin [ osxfuse ];
checkInputs = [ pytest which ] ++
optionals stdenv.isLinux [ attr ];
propagatedBuildInputs = [ contextlib2 ];
checkPhase = ''
py.test -k "not test_listdir"
py.test -k "not test_listdir" ${optionalString stdenv.isDarwin ''-m "not uses_fuse"''}
'';
meta = with stdenv.lib; {

View file

@ -17,8 +17,8 @@ python3.pkgs.buildPythonApplication rec {
libb2 lz4 zstd openssl python3.pkgs.setuptools_scm
] ++ stdenv.lib.optionals stdenv.isLinux [ acl ];
propagatedBuildInputs = with python3.pkgs; [
cython
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ llfuse ];
cython llfuse
];
preConfigure = ''
export BORG_OPENSSL_PREFIX="${openssl.dev}"