jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #37884 from dtzWill/fix/nilfs-utils-musl

Browse Source 
nilfs-utils: apply upstream patches to fix w/musl
This commit is contained in:
Will Dietz 2018-03-26 14:13:28 -05:00 committed by GitHub
commit 9f1c8c57c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
sourceInfo = rec {
version = "2.2.7";
@ -23,6 +23,18 @@ stdenv.mkDerivation rec {
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
# still doesn't use it
#