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

nfs-utils: use upstream patch to fix i686 build

Browse Source
This commit is contained in:
Nikolay Amiantov
2019-06-06 21:26:18 +03:00
parent 9d11c30cf9
commit 63ac0fa94d
2 changed files with 6 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/nfs-utils/default.nix
+6 -1
View File
@@ -48,7 +48,12 @@ stdenv.mkDerivation rec {
++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
patches = [
./nfsdcld-sqlite-format.patch
# Fixes build on i686.
(fetchpatch {
name = "sqlite.c-Use-PRIx64-macro-to-print-64-bit-integers.patch";
url = "http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff_plain;h=a8133e1fd174267536cd459e19cfe0a1cbbe037c;hp=a709f25c1da4a2fb44a1f3fd060298fbbd88aa3c";
sha256 = "03azkw13xhp8f49777p08xziy0d7crz65qrisjbkzjnx1wczdqy5";
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch";