btfs: 3.1 -> 3.2

This commit is contained in:
rnhmjoj
2026-08-16 23:29:06 +02:00
parent 575218c94e
commit 6f905623af
2 changed files with 2 additions and 38 deletions

View File

@@ -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 <http://www.gnu.org/licenses/>.
#define FUSE_USE_VERSION 31
+#ifdef __APPLE__
+#define FUSE_DARWIN_ENABLE_EXTENSIONS 0
+#endif
+
#include <cstdlib>
#include <iostream>
#include <fstream>
@@ -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;

View File

@@ -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