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

Merge pull request #104792 from SuperSandro2000/autofs-fix

Browse Source 
autofs: fix compilation fail due to libtirpc changes
This commit is contained in:
Maximilian Bosch 2020-11-27 19:09:41 +01:00 committed by GitHub
commit b19ad349b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/autofs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs { stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: , libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
let let
version = "5.1.6"; version = "5.1.6";
@ -28,13 +28,16 @@ in stdenv.mkDerivation {
unset STRIP # Makefile.rules defines a usable STRIP only without the env var. unset STRIP # Makefile.rules defines a usable STRIP only without the env var.
''; '';
# configure script is not finding the right path
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
installPhase = '' installPhase = ''
make install SUBDIRS="lib daemon modules man" # all but samples make install SUBDIRS="lib daemon modules man" # all but samples
#make install SUBDIRS="samples" # impure! #make install SUBDIRS="samples" # impure!
''; '';
buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd
openssl cyrus_sasl ]; openssl cyrus_sasl rpcsvc-proto ];
nativeBuildInputs = [ flex bison ]; nativeBuildInputs = [ flex bison ];