diff --git a/pkgs/by-name/bt/btfs/disable-macfuse-extensions.patch b/pkgs/by-name/bt/btfs/disable-macfuse-extensions.patch deleted file mode 100644 index 624fd3eb9191..000000000000 --- a/pkgs/by-name/bt/btfs/disable-macfuse-extensions.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/btfs.cc b/src/btfs.cc -index eaac245..6bae7c0 100644 ---- a/src/btfs.cc -+++ b/src/btfs.cc -@@ -19,6 +19,10 @@ along with BTFS. If not, see . - - #define FUSE_USE_VERSION 31 - -+#ifdef __APPLE__ -+#define FUSE_DARWIN_ENABLE_EXTENSIONS 0 -+#endif -+ - #include - #include - #include -@@ -733,15 +737,9 @@ btfs_listxattr(const char *path, char *data, size_t len) { - return xattrslen; - } - --#ifdef __APPLE__ --static int --btfs_getxattr(const char *path, const char *key, char *value, size_t len, -- uint32_t position) { --#else - static int - btfs_getxattr(const char *path, const char *key, char *value, size_t len) { - uint32_t position = 0; --#endif - char xattr[16]; - int xattrlen = 0; - diff --git a/pkgs/by-name/bt/btfs/package.nix b/pkgs/by-name/bt/btfs/package.nix index 4a3652a7b999..1d015577acec 100644 --- a/pkgs/by-name/bt/btfs/package.nix +++ b/pkgs/by-name/bt/btfs/package.nix @@ -13,20 +13,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "btfs"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "johang"; repo = "btfs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-JuofC4TpbZ56qiUrHeoK607YHVbwqwLGMIdUpsTm9Ic="; + sha256 = "sha256-g8ta5T17iKTpdR0wMQe1LU78LTIxwECmf86o4IlVF00="; }; - patches = [ - # https://github.com/johang/btfs/pull/103 - ./disable-macfuse-extensions.patch - ]; - nativeBuildInputs = [ autoreconfHook pkg-config