Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4e721164a807
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 43082f7f1940
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 24, 2020

  1. sssd: fix build on glibc-2.32 

    For https://hydra.nixos.org/build/128488320 which errored with:

    src/responder/nss/nss_cmd.c:733:16: error: 'nss_setnetgrent' redeclared as different kind of symbol
      733 | static errno_t nss_setnetgrent(struct cli_ctx *cli_ctx,
          |                ^~~~~~~~~~~~~~~
    In file included from ./src/sss_client/sss_cli.h:28,
                     from ./src/db/sysdb.h:27,
                     from src/responder/nss/nss_cmd.c:26:
    /nix/store/a2n8nrsf215x01a7fv8l94crdjwf69pa-glibc-2.32-dev/include/nss.h:184:25: note: previous declaration of 'nss_setnetgrent' was here
      184 | typedef enum nss_status nss_setnetgrent (const char *, struct __netgrent *);
          |                         ^~~~~~~~~~~~~~~
    make[2]: *** [Makefile:17818: src/responder/nss/nss_cmd.o] Error 1
    make[2]: Leaving directory '/build/sssd-1.16.4'
    make[1]: *** [Makefile:33824: all-recursive] Error 1
    make[1]: Leaving directory '/build/sssd-1.16.4'
    make: *** [Makefile:10123: all] Error 2
    @grahamc
    grahamc committed Nov 24, 2020
    Copy the full SHA
    22965d8 View commit details

  2. Merge pull request #104774 from grahamc/sssd 

    sssd: fix build on glibc-2.32
    @SuperSandro2000
    SuperSandro2000 authored Nov 24, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    43082f7 View commit details
Showing with 10 additions and 0 deletions.
  1. +10 −0 pkgs/os-specific/linux/sssd/default.nix
10 changes: 10 additions & 0 deletions pkgs/os-specific/linux/sssd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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