diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2020-11-24 20:09:04 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2020-11-24 20:09:04 +0100 |
| commit | 2044fa172d75946ec4aceaf2af3f4f3baf0b8280 (patch) | |
| tree | a9fde04444a7092cc5ddc78474e4c34eb78336b4 /pkgs/os-specific/linux/sssd | |
| parent | 9a515a9d458926c928f00d0bb67fc06e9b2dafbb (diff) | |
| download | nixpkgs-2044fa172d75946ec4aceaf2af3f4f3baf0b8280.tar nixpkgs-2044fa172d75946ec4aceaf2af3f4f3baf0b8280.tar.gz nixpkgs-2044fa172d75946ec4aceaf2af3f4f3baf0b8280.tar.bz2 nixpkgs-2044fa172d75946ec4aceaf2af3f4f3baf0b8280.tar.lz nixpkgs-2044fa172d75946ec4aceaf2af3f4f3baf0b8280.tar.xz nixpkgs-2044fa172d75946ec4aceaf2af3f4f3baf0b8280.tar.zst nixpkgs-2044fa172d75946ec4aceaf2af3f4f3baf0b8280.zip | |
sssd: fix nss collision with upstream patch
Diffstat (limited to 'pkgs/os-specific/linux/sssd')
| -rw-r--r-- | pkgs/os-specific/linux/sssd/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 537764e0c73..05866f94269 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { url = "https://github.com/SSSD/sssd/commit/bc56b10aea999284458dcc293b54cf65288e325d.patch"; sha256 = "0q74sx5n41srq3kdn55l5j1sq4xrjsnl5y4v8yh5mwsijj74yh4g"; }) + # Fix collision with external nss symbol + (fetchpatch { + url = "https://github.com/SSSD/sssd/commit/fe9eeb51be06059721e873f77092b1e9ba08e6c1.patch"; + sha256 = "0b83b2w0rnvm26pg03a4lpmkmi7n3gqxg7lk751q61q79gnzrpz4"; + }) ]; # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h> @@ -54,16 +59,6 @@ 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 |