autofs: fix build w/glibc-2.34
This build was also broken by a libc const that isn't a number anymore and thus can't be used at places where a constant value is needed: automount.c:86:37: error: initializer element is not constant Failing Hydra build: https://hydra.nixos.org/build/153253104
This commit is contained in:
parent
486f248ce4
commit
f81f59dfce
@ -1,5 +1,7 @@
|
|||||||
{ lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
|
{ lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs
|
||||||
, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }:
|
, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto
|
||||||
|
, fetchpatch
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "5.1.6";
|
version = "5.1.6";
|
||||||
@ -10,6 +12,15 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx";
|
sha256 = "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# glibc 2.34 compat
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://src.fedoraproject.org/rpms/autofs/raw/cc745af5e42396d540d5b3b92fae486e232bf6bd/f/autofs-5.1.7-use-default-stack-size-for-threads.patch";
|
||||||
|
sha256 = "sha256-6ETDFbW7EhHR03xFWF+6OJBgn9NX3WW3bGhTNGodaOc=";
|
||||||
|
excludes = [ "CHANGELOG" ];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH"
|
configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH"
|
||||||
export sssldir="${sssd}/lib/sssd/modules"
|
export sssldir="${sssd}/lib/sssd/modules"
|
||||||
|
Loading…
Reference in New Issue
Block a user