summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Childs <lorne@cons.org.nz>2020-01-25 04:09:03 +0900
committerAndrew Childs <lorne@cons.org.nz>2020-01-25 12:59:31 +0900
commit6d46f05945a27953bc95f95715b002db442db120 (patch)
tree37013658fce3ef502ea32af845efaaa4a74e4ad0
parent24b7d0de7be34a7612d13536963b8e35ec9b261a (diff)
downloadnixpkgs-6d46f05945a27953bc95f95715b002db442db120.tar
nixpkgs-6d46f05945a27953bc95f95715b002db442db120.tar.gz
nixpkgs-6d46f05945a27953bc95f95715b002db442db120.tar.bz2
nixpkgs-6d46f05945a27953bc95f95715b002db442db120.tar.lz
nixpkgs-6d46f05945a27953bc95f95715b002db442db120.tar.xz
nixpkgs-6d46f05945a27953bc95f95715b002db442db120.tar.zst
nixpkgs-6d46f05945a27953bc95f95715b002db442db120.zip
pythonPackages.llfuse: darwin support via osxfuse
-rw-r--r--pkgs/development/python-modules/llfuse/default.nix29
1 files changed, 24 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index 6a497358404..02adb5a8d16 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -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; {