summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2020-11-24 19:53:06 +0100
committerGitHub <noreply@github.com>2020-11-24 19:53:06 +0100
commit43082f7f19404f1e8c15e652ceb292b332e8256a (patch)
tree1c91299a8fedb8735ea7ad4296f26264fadbd7af
parent4e721164a807f2dd5ca8b3cdb962f5396afba11d (diff)
parent22965d84d5e57307d4f6f02d32b50adac2cbb6bb (diff)
downloadnixpkgs-43082f7f19404f1e8c15e652ceb292b332e8256a.tar
nixpkgs-43082f7f19404f1e8c15e652ceb292b332e8256a.tar.gz
nixpkgs-43082f7f19404f1e8c15e652ceb292b332e8256a.tar.bz2
nixpkgs-43082f7f19404f1e8c15e652ceb292b332e8256a.tar.lz
nixpkgs-43082f7f19404f1e8c15e652ceb292b332e8256a.tar.xz
nixpkgs-43082f7f19404f1e8c15e652ceb292b332e8256a.tar.zst
nixpkgs-43082f7f19404f1e8c15e652ceb292b332e8256a.zip
Merge pull request #104774 from grahamc/sssd
sssd: fix build on glibc-2.32
-rw-r--r--pkgs/os-specific/linux/sssd/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 22e2da79c8c..537764e0c73 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -54,6 +54,16 @@ stdenv.mkDerivation rec {
     configureFlagsArray+=("--with-sudo")
   '';
 
+  preBuild = ''
+    # glibc-2.32 includes a full set of NSS stub module declarations
+    # that conflict with the ones in sssd source. Define _NSS_H to
+    # prevent them from breaking the compilation, but just for this
+    # one file.
+    cat >> Makefile <<EOF
+      src/responder/nss/nss_cmd.\$(OBJEXT) : DEFS = -DHAVE_CONFIG_H -D_NSS_H
+    EOF
+  '';
+
   enableParallelBuilding = true;
   buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
                   samba nfs-utils doxygen python python3 popt