From 537b2daba9a5f0c17bde2203e6fb074a661d5b32 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 7 Nov 2019 10:22:24 +0100 Subject: gnu: commencement: Ensure 'gnu-make-final' refers to the native 'pkg-config'. Fixes . When running: guix build --target=arm-linux-gnueabihf -e '(@ (gnu packages base) coreutils)' the '%current-target-system' parameter is set by the time the top-level of (gnu packages commencement) is evaluated. Consequently, we need to ensure that the 'pkg-config' macro evaluates in a context where '%current-target-system' is unset. * gnu/packages/commencement.scm (gnu-make-final): Refer to '%pkg-config' instead of 'pkg-config'. * tests/guix-build.sh: Add test. --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/commencement.scm') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b022a0d634..6a382c7517 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2402,7 +2402,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; PKG-CONFIG. ;; TODO: Fix that on the next rebuild cycle. (let ((pkg-config (package - (inherit pkg-config) + (inherit %pkg-config) ;the native pkg-config (inputs `(("guile" ,guile-final) ,@(%boot5-inputs))) (arguments -- cgit v1.2.3