diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-09-16 23:04:56 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2022-02-27 10:25:36 +0100 |
| commit | 8631ba18eee7fe48dc17244fa8b6425b3d84201e (patch) | |
| tree | 07bbfa9e8a710e879c3016fbdede79e1bc78bd98 /pkgs/os-specific/linux/fuse | |
| parent | 3aa6c49ab4a6b094ab6f125303b674bb99985f35 (diff) | |
fuse: fix build w/glibc-2.34
`closefrom` is now a part of `glibc-2.34`[1]: > * The function closefrom has been added. It closes all file descriptors > greater than or equal to a given integer. This function is a GNU extension, > although it is also present in other systems. Failing Hydra build: https://hydra.nixos.org/build/152456339 [1] https://sourceware.org/pipermail/libc-alpha/2021-August/129718.html
Diffstat (limited to 'pkgs/os-specific/linux/fuse')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 5adb1b5355ad4..88035cf60c805 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -31,7 +31,13 @@ in stdenv.mkDerivation rec { }) ++ (if isFuse3 then [ ./fuse3-install.patch ./fuse3-Do-not-set-FUSERMOUNT_DIR.patch ] - else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]); + else [ + ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch + (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="; + }) + ]); nativeBuildInputs = if isFuse3 then [ meson ninja pkg-config ] |