fuse: fix build (#421040)

Changed files
+14 -5
pkgs
os-specific
+1 -5
pkgs/os-specific/linux/fuse/common.nix
···
inherit hash;
};
-
preAutoreconf = "touch config.rpath";
-
patches =
lib.optional (!isFuse3 && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isLoongArch64))
(fetchpatch {
···
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch?id=8a970396fca7aca2d5a761b8e7a8242f1eef14c9";
sha256 = "sha256-ELYBW/wxRcSMssv7ejCObrpsJHtOPJcGq33B9yHQII4=";
})
+
./fuse2-gettext-0.25.patch
]
);
···
# No need to use the SUID wrapper.
substituteInPlace util/mount.fuse.c \
--replace-fail '"su"' '"${lib.getBin shadow.su}/bin/su"'
-
substituteInPlace makeconf.sh \
-
--replace-fail 'CONFIG_RPATH=/usr/share/gettext/config.rpath' 'CONFIG_RPATH=${lib.getLib gettext}/share/gettext/config.rpath'
-
./makeconf.sh
'';
# v2: no tests, v3: all tests get skipped in a sandbox
+13
pkgs/os-specific/linux/fuse/fuse2-gettext-0.25.patch
···
+
diff --git a/configure.ac b/configure.ac
+
index 9946a0e..4621771 100644
+
--- a/configure.ac
+
+++ b/configure.ac
+
@@ -4,6 +4,8 @@ AC_PREREQ(2.59d)
+
AC_CONFIG_MACRO_DIR([m4])
+
AC_CANONICAL_TARGET
+
AM_INIT_AUTOMAKE([foreign])
+
+AM_GNU_GETTEXT_VERSION([0.25])
+
+AM_GNU_GETTEXT([external])
+
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
+
AC_CONFIG_HEADERS(include/config.h)
+