diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-12 11:07:33 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-09-12 23:04:46 +0200 |
| commit | 0efbea1da8c3812c22498c5ff44e59f7d20c8fea (patch) | |
| tree | 8fe4642e7fefe6ccef97b125409f73bdaa3789d6 /pkgs/os-specific/linux/nfs-utils | |
| parent | 59637a44746f1423e3c5728da15c2a64ff30408e (diff) | |
| download | nixpkgs-0efbea1da8c3812c22498c5ff44e59f7d20c8fea.tar nixpkgs-0efbea1da8c3812c22498c5ff44e59f7d20c8fea.tar.gz nixpkgs-0efbea1da8c3812c22498c5ff44e59f7d20c8fea.tar.bz2 nixpkgs-0efbea1da8c3812c22498c5ff44e59f7d20c8fea.tar.lz nixpkgs-0efbea1da8c3812c22498c5ff44e59f7d20c8fea.tar.xz nixpkgs-0efbea1da8c3812c22498c5ff44e59f7d20c8fea.tar.zst nixpkgs-0efbea1da8c3812c22498c5ff44e59f7d20c8fea.zip | |
nfs-utils: 2.4.1 -> 2.5.1, fix build w/glibc-2.32
Diffstat (limited to 'pkgs/os-specific/linux/nfs-utils')
| -rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 719ded4d70f..81ec7e5a661 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3, buildPackages, nixosTests +, python3, buildPackages, nixosTests, rpcsvc-proto , enablePython ? true }: @@ -10,18 +10,18 @@ in stdenv.mkDerivation rec { pname = "nfs-utils"; - version = "2.4.1"; + version = "2.5.1"; src = fetchurl { 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, # put it in the "lib" output, and the headers in "dev" outputs = [ "out" "dev" "lib" "man" ]; - nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc rpcsvc-proto ]; buildInputs = [ libtirpc libcap libevent sqlite lvm2 @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { "--with-systemd=${placeholder "out"}/etc/systemd/system" "--enable-libmount-mount" "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap - ] - ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; + "--with-rpcgen=${rpcsvc-proto}/bin/rpcgen" + ]; patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { |