From a6194d1f35ec8ac9b58f4d05affa5aabf1ca7014 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 4 Mar 2023 17:40:44 +0100 Subject: gnu: cross-base: Inherit arguments from 'mig'. That way, 'xmig' inherits the 'avoid-perl-dependency' build phase. * gnu/packages/hurd.scm (mig)[arguments]: In 'avoid-perl-dependency', use 'find-files' to locate the "mig" executable(s). * gnu/packages/cross-base.scm (cross-kernel-headers*)[xmig]: Use 'substitute-keyword-arguments'. --- gnu/packages/cross-base.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'gnu/packages/cross-base.scm') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index fbedf6e833..2959616af6 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -415,19 +415,20 @@ (define xmig (inherit mig) (name (string-append "mig-cross")) (arguments - (list #:modules '((guix build gnu-build-system) - (guix build utils) - (srfi srfi-26)) - #:phases - #~(modify-phases %standard-phases - (add-before 'configure 'set-cross-headers-path - (lambda* (#:key inputs #:allow-other-keys) - (let* ((mach #+(this-package-input xgnumach-headers-name)) - (cpath (string-append mach "/include"))) - (for-each (cut setenv <> cpath) - '#$%gcc-cross-include-paths))))) - #:configure-flags #~(list #$(string-append "--target=" target)) - #:tests? #f)) + (substitute-keyword-arguments (package-arguments mig) + ((#:configure-flags flags #~'()) + #~(list #$(string-append "--target=" target))) + ((#:tests? _ #f) + #f) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'configure 'set-cross-headers-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((mach #+(this-package-input xgnumach-headers-name)) + (cpath (string-append mach "/include"))) + (for-each (lambda (variable) + (setenv variable cpath)) + '#$%gcc-cross-include-paths)))))))) (propagated-inputs (list xgnumach-headers)) (native-inputs (modify-inputs (package-native-inputs mig) -- cgit v1.2.3