diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
| commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
| tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/tools/filesystems/nilfs-utils/default.nix | |
| parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
| parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
| download | nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2 nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip | |
Merge staging into master
Diffstat (limited to 'pkgs/tools/filesystems/nilfs-utils/default.nix')
| -rw-r--r-- | pkgs/tools/filesystems/nilfs-utils/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 977add39b94b..5bce33065192 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -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 # |