diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
| commit | b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf (patch) | |
| tree | 220c385a8657d85bb6b305819a1842a3b1f4079c /pkgs/os-specific/linux/sssd/default.nix | |
| parent | 977848375167f4671a03ccc0dbf5896f4cf0d3fe (diff) | |
| parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
| download | nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.gz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.bz2 nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.lz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.xz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.zst nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/sssd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/sssd/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 22e2da79c8c..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> |