From 527455be35c33e25cc76805a6f879d85a3624339 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 24 Aug 2021 22:29:56 +0200 Subject: gnu: heimdal: Refer to cross-compiled bash. * gnu/packages/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}: Let "appl/afsutil/pagsh.c" refer to the cross-compiled bash instead of the native bash when cross-compiling. --- gnu/packages/kerberos.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'gnu/packages/kerberos.scm') diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 54dd5dffc1..9afc6a363f 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -231,11 +231,24 @@ After installation, the system administrator should generate keys using '())) #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda _ - (substitute* '("appl/afsutil/pagsh.c" - "tools/Makefile.in") - (("/bin/sh") (which "sh"))) - #t)) + ;; TODO(core-updates): Unconditionally use the + ;; %current-target-system branch. + (,(if (%current-target-system) + 'lambda* + 'lambda) + ,(if (%current-target-system) + '(#:key inputs #:allow-other-keys) + '_) + ,@(if (%current-target-system) + '((substitute* '("appl/afsutil/pagsh.c") + (("/bin/sh") + (search-input-file inputs "bin/sh"))) + (substitute* '("tools/Makefile.in") + (("/bin/sh") (which "sh")))) + '((substitute* '("appl/afsutil/pagsh.c" + "tools/Makefile.in") + (("/bin/sh") (which "sh"))) + #t)))) (add-before 'check 'pre-check (lambda _ ;; For 'getxxyyy-test'. -- cgit v1.2.3