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: f1e5a60e825b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c2419b55f932
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 24, 2020

  1. sssd: fix nss collision with upstream patch

    @SuperSandro2000
    SuperSandro2000 committed Nov 24, 2020
    Copy the full SHA
    2044fa1 View commit details

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

    sssd: fix nss collision with upstream patch
    @Mic92
    Mic92 authored Nov 24, 2020
    Copy the full SHA
    c2419b5 View commit details
Showing with 5 additions and 10 deletions.
  1. +5 −10 pkgs/os-specific/linux/sssd/default.nix
15 changes: 5 additions & 10 deletions pkgs/os-specific/linux/sssd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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