From 839285dd5b2980cb9feaacb22c6c43565deeb6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 14 May 2024 17:26:46 +0200 Subject: [PATCH] gnu: Avoid cycle involving (gnu packages pkg-config). Fixes a regression introduced in 7a26aee61bbbd8e37745ce13433545333eac4505 whereby (gnu packages pkg-config) would be caught in a cycle, leading to miscompilation of package modules, in turn leading to failure to compute the Guix derivation with exceptions like: 1. &package-input-error: package: # input: ("_" #) * gnu/packages/pkg-config.scm: Autoload (gnu packages check). Change-Id: I624e701a0c411b6f3d9ad5e10dca6ad7cf552be4 --- gnu/packages/pkg-config.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index d1c6c644ac..d5655bd893 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -29,7 +29,13 @@ (define-module (gnu packages pkg-config) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages bash) - #:use-module (gnu packages check) + + ;; Note: Because this module defines the 'pkg-config' macro, it cannot be + ;; caught in a cycle with other package modules or the macro wouldn't be + ;; visible at the time those other modules are compiled. To fulfill that + ;; constraint, load (gnu packages check) lazily. + #:autoload (gnu packages check) (atf kyua) + #:use-module (guix memoization) #:export (pkg-config))