Skip to content

Commit

Permalink
heimdal: remove absolute path to pwd, replace patchPhase with postPat…
Browse files Browse the repository at this point in the history
…ch to not break patches

(cherry picked from commit b0231c9)
  • Loading branch information
SuperSandro2000 authored and wegank committed Dec 6, 2024
1 parent 973049e commit 7d0cb40
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions pkgs/development/libraries/kerberos/heimdal.nix
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,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,
Expand Down

0 comments on commit 7d0cb40

Please sign in to comment.