From f59df1aa3c104aabff3291f6b8b155fb01aebc06 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 9 Oct 2023 11:10:48 -0400 Subject: build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules. Until now users would have to cargo cult or inspect the private %default-modules variable of (guix build-systems gnu) to discover which modules to include when extending the used modules via the #:modules argument. The renaming was automated via the command: $ git grep -l %gnu-build-system-modules | xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i * guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to... (%default-gnu-imported-modules): ... this. (%default-modules): Rename to... (%default-gnu-modules): ... this. Export. (dist-package, gnu-build, gnu-cross-build): Adjust accordingly. Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee --- gnu/packages/freedesktop.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 92937d626c..27e64770d4 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -523,7 +523,7 @@ (define xdgmime #:make-flags #~(list (string-append "DESTDIR=" #$output) #$(string-append "CC=" (cc-for-target))) #:imported-modules `((guix build copy-build-system) - ,@%gnu-build-system-modules) + ,@%default-gnu-imported-modules) #:modules `((guix build gnu-build-system) ((guix build copy-build-system) #:prefix copy:) (guix build utils)) @@ -643,8 +643,7 @@ (define-public xdg-utils (list #:tests? #f ;no check target #:modules `((srfi srfi-26) - (guix build gnu-build-system) - (guix build utils)) + ,@%default-gnu-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-hardcoded-paths -- cgit v1.2.3