b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fuse: fix build w/glibc-2.34

Browse source 
`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
This commit is contained in:
Maximilian Bosch 2021-09-16 23:04:56 +02:00
parent 3aa6c49ab4
commit 8631ba18ee
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/fuse/common.nix
View file

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