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

nfs-utils: 2.4.1 -> 2.5.1, fix build w/glibc-2.32

Browse Source
This commit is contained in:
Maximilian Bosch 2020-08-12 11:07:33 +02:00
parent 59637a4474
commit 0efbea1da8
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/nfs-utils/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent { stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent
, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
, python3, buildPackages, nixosTests , python3, buildPackages, nixosTests, rpcsvc-proto
, enablePython ? true , enablePython ? true
}: }:
@ -10,18 +10,18 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nfs-utils"; pname = "nfs-utils";
version = "2.4.1"; version = "2.5.1";
src = fetchurl { src = fetchurl {
url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz";
sha256 = "0dkp11a7i01c378ri68bf6k56z27kz8zzvpqm7mip6s7jkd4l9w5"; sha256 = "1i1h3n2m35q9ixs1i2qf1rpjp10cipa3c25zdf1xj1vaw5q8270g";
}; };
# libnfsidmap is built together with nfs-utils from the same source, # libnfsidmap is built together with nfs-utils from the same source,
# put it in the "lib" output, and the headers in "dev" # put it in the "lib" output, and the headers in "dev"
outputs = [ "out" "dev" "lib" "man" ]; outputs = [ "out" "dev" "lib" "man" ];
nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc rpcsvc-proto ];
buildInputs = [ buildInputs = [
libtirpc libcap libevent sqlite lvm2 libtirpc libcap libevent sqlite lvm2
@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
"--with-systemd=${placeholder "out"}/etc/systemd/system" "--with-systemd=${placeholder "out"}/etc/systemd/system"
"--enable-libmount-mount" "--enable-libmount-mount"
"--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
] "--with-rpcgen=${rpcsvc-proto}/bin/rpcgen"
++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; ];
patches = lib.optionals stdenv.hostPlatform.isMusl [ patches = lib.optionals stdenv.hostPlatform.isMusl [
(fetchpatch { (fetchpatch {