From b0231c99816388bf8838114040abe05e1db616fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 10 Oct 2024 17:39:00 +0200 Subject: [PATCH] heimdal: remove absolute path to pwd, replace patchPhase with postPatch to not break patches --- pkgs/development/libraries/kerberos/heimdal.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 4d9c34d728d1..5b2409a779e6 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -117,17 +117,15 @@ stdenv.mkDerivation { # (check-ldap) the bdb backend got deprecated in favour of mdb in openldap 2.5.0, # but the heimdal tests still seem to expect bdb as the openldap backend. # This might be fixed upstream in a future update. - patchPhase = '' - runHook prePatch - + postPatch = '' substituteInPlace tests/ldap/slapd-init.in \ - --replace 'SCHEMA_PATHS="' 'SCHEMA_PATHS="${openldap}/etc/schema ' + --replace-fail 'SCHEMA_PATHS="' 'SCHEMA_PATHS="${openldap}/etc/schema ' substituteInPlace tests/ldap/check-ldap.in \ - --replace 'PATH=' 'PATH=${openldap}/libexec:${openldap}/bin:' + --replace-fail 'PATH=' 'PATH=${openldap}/libexec:${openldap}/bin:' substituteInPlace tests/ldap/slapd.conf \ - --replace 'database bdb' 'database mdb' - - runHook postPatch + --replace-fail 'database bdb' 'database mdb' + substituteInPlace tests/kdc/check-iprop.in \ + --replace-fail '/bin/pwd' 'pwd' ''; # (test_cc) heimdal uses librokens implementation of `secure_getenv` on darwin,