BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nilfs-utils: apply upstream patches to fix w/musl

Browse source
This commit is contained in:
Will Dietz 2018-03-26 13:57:24 -05:00
parent 59a53aada0
commit da0da6177d
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/tools/filesystems/nilfs-utils/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libuuid, libselinux }: { stdenv, fetchurl, fetchpatch, libuuid, libselinux }:
let let
sourceInfo = rec { sourceInfo = rec {
version = "2.2.7"; version = "2.2.7";
@ -23,6 +23,18 @@ stdenv.mkDerivation rec {
sed -e 's@/sbin/@'"$out"'/sbin/@' -i ./lib/cleaner*.c sed -e 's@/sbin/@'"$out"'/sbin/@' -i ./lib/cleaner*.c
''; '';
patches = [
# Fix w/musl
(fetchpatch {
url = "https://github.com/nilfs-dev/nilfs-utils/commit/115fe4b976858c487cf83065f513d8626089579a.patch";
sha256 = "0h89jz9l5d4rqj647ljbnv451l4ncqpsvzj0v70mn5391hfwsjlv";
})
(fetchpatch {
url = "https://github.com/nilfs-dev/nilfs-utils/commit/51b32c614be9e98c32de7f531ee600ca0740946f.patch";
sha256 = "1ycq83c6jjy74aif47v075k5y2szzwhq6mbcrpd1z4b4i1x6yhpn";
})
];
# FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv
# still doesn't use it # still doesn't use it
# #