From 43e85c55ae18e21bd0b7e324a6f6ebbfe1c826f8 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 6 Apr 2024 15:21:03 +0200 Subject: [PATCH] sssd: fix build Samba has been updated to 4.20 with PR #300156 However, sssd 2.9.4 is incompatible with Samba 4.20 A resolution is to backport an unreleased fix to make the build work with Samba 4.20. Fixes #302062 --- pkgs/os-specific/linux/sssd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index a4a0d1dd49ff..0f0c6fcf4a65 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -5,7 +5,7 @@ libuuid, systemd, nspr, check, cmocka, uid_wrapper, p11-kit, nss_wrapper, ncurses, Po4a, http-parser, jansson, jose, docbook_xsl, docbook_xml_dtd_44, - testers, nix-update-script, nixosTests, + testers, nix-update-script, nixosTests, fetchpatch, withSudo ? false }: let @@ -22,6 +22,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-VJXZndbmC6mAVxzvv5Wjb4adrQkP16Rt4cgjl4qGDIc="; }; + patches = [ + # Fix the build with Samba 4.20 + (fetchpatch { + url = "https://github.com/SSSD/sssd/commit/1bf51929a48b84d62ac54f2a42f17e7fbffe1612.patch"; + hash = "sha256-VLx04APEipp860iOJNIwTGywxZ7rIDdyh3te6m7Ymlo="; + }) + ]; + postPatch = '' patchShebangs ./sbus_generate.sh.in '';