From b770f35b4de1c7ad0a323e805b4bae59786e3c20 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 17 Dec 2025 00:58:14 +0100 Subject: [PATCH 1/2] openldap: fix build with structuredAttrs --- pkgs/by-name/op/openldap/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix index 3ebf541856ef..2a680d4c0f09 100644 --- a/pkgs/by-name/op/openldap/package.nix +++ b/pkgs/by-name/op/openldap/package.nix @@ -108,8 +108,8 @@ stdenv.mkDerivation rec { ]; postBuild = '' - for module in $extraContribModules; do - make $makeFlags CC=$CC -C contrib/slapd-modules/$module + for module in ''${extraContribModules[@]}; do + make ''${makeFlags[@]} CC=$CC -C contrib/slapd-modules/$module done ''; @@ -144,8 +144,8 @@ stdenv.mkDerivation rec { ]; postInstall = lib.optionalString withModules '' - for module in $extraContribModules; do - make $installFlags install -C contrib/slapd-modules/$module + for module in ''${extraContribModules[@]}; do + make ''${installFlags[@]} install -C contrib/slapd-modules/$module done chmod +x "$out"/lib/*.{so,dylib} ''; From 51c78494b9ff1a5a4833e15177bfd6631a8e3e3c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 17 Dec 2025 00:58:22 +0100 Subject: [PATCH 2/2] openldap: use --replace-fail instead of --replace --- pkgs/by-name/op/openldap/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/op/openldap/package.nix b/pkgs/by-name/op/openldap/package.nix index 2a680d4c0f09..cf67b943b3c9 100644 --- a/pkgs/by-name/op/openldap/package.nix +++ b/pkgs/by-name/op/openldap/package.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { preCheck = '' substituteInPlace tests/scripts/all \ - --replace "/bin/rm" "rm" + --replace-fail "/bin/rm" "rm" # skip flaky tests # https://bugs.openldap.org/show_bug.cgi?id=8623