git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #104792 from SuperSandro2000/autofs-fix

autofs: fix compilation fail due to libtirpc changes

commitb19ad349b071f48c96dd6ec56580afc1bfeac66b authorMaximilian Bosch <maximilian@mbosch.me> dateFri 27 Nov 2020, 19:09 (6 years ago) parentb124d004d5ab8d
1 file changed+5−2
pkgs/os-specific/linux/autofs/default.nix+5−2
pkgs/os-specific/linux/autofs/default.nix+5−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
2−, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
2+, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
33
44let
55 version = "5.1.6";
@@ -28,13 +28,16 @@ in stdenv.mkDerivation {
2828 unset STRIP # Makefile.rules defines a usable STRIP only without the env var.
2929 '';
3030
31+ # configure script is not finding the right path
32+ NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
33+
3134 installPhase = ''
3235 make install SUBDIRS="lib daemon modules man" # all but samples
3336 #make install SUBDIRS="samples" # impure!
3437 '';
3538
3639 buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd
37− openssl cyrus_sasl ];
40+ openssl cyrus_sasl rpcsvc-proto ];
3841
3942 nativeBuildInputs = [ flex bison ];
4043