diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-09-17 22:25:19 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2022-02-27 10:25:37 +0100 |
| commit | f81f59dfce012b9835980e2865e1c107fca009c8 (patch) | |
| tree | 972010150cf7d355643df2877bdb5d08e9ccc161 /pkgs/os-specific/linux/autofs | |
| parent | 486f248ce46043cd4c76e60012c83a14f310784e (diff) | |
| download | nixpkgs-f81f59dfce012b9835980e2865e1c107fca009c8.tar nixpkgs-f81f59dfce012b9835980e2865e1c107fca009c8.tar.gz nixpkgs-f81f59dfce012b9835980e2865e1c107fca009c8.tar.bz2 nixpkgs-f81f59dfce012b9835980e2865e1c107fca009c8.tar.lz nixpkgs-f81f59dfce012b9835980e2865e1c107fca009c8.tar.xz nixpkgs-f81f59dfce012b9835980e2865e1c107fca009c8.tar.zst nixpkgs-f81f59dfce012b9835980e2865e1c107fca009c8.zip | |
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
Diffstat (limited to 'pkgs/os-specific/linux/autofs')
| -rw-r--r-- | pkgs/os-specific/linux/autofs/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 7b29f5a0e5c..5e552301fe4 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,5 +1,7 @@ { 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 { version = "5.1.6"; @@ -10,6 +12,15 @@ stdenv.mkDerivation rec { 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 = '' configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH" export sssldir="${sssd}/lib/sssd/modules" |