public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104795 from SuperSandro2000/sssd-upstream-patch

Browse Source 
sssd: fix nss collision with upstream patch
This commit is contained in:
Jörg Thalheim 2020-11-24 20:28:21 +01:00 committed by GitHub
commit c2419b55f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/sssd/default.nix
View File

@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/SSSD/sssd/commit/bc56b10aea999284458dcc293b54cf65288e325d.patch"; url = "https://github.com/SSSD/sssd/commit/bc56b10aea999284458dcc293b54cf65288e325d.patch";
sha256 = "0q74sx5n41srq3kdn55l5j1sq4xrjsnl5y4v8yh5mwsijj74yh4g"; 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> # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>
@ -54,16 +59,6 @@ stdenv.mkDerivation rec {
configureFlagsArray+=("--with-sudo") 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; enableParallelBuilding = true;
buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
samba nfs-utils doxygen python python3 popt samba nfs-utils doxygen python python3 popt