diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-10-09 11:10:48 -0400 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-06-17 22:51:43 +0200 |
| commit | d9e84850736a12ed3a48233e8c2d4faef2023efc (patch) | |
| tree | e063e02f96edcb74d4c6e68754214c274f72cebb /gnu/packages/freedesktop.scm | |
| parent | 4d6c6540feaf79a148f90a3e8d95e14329525a80 (diff) | |
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
Diffstat (limited to 'gnu/packages/freedesktop.scm')
| -rw-r--r-- | gnu/packages/freedesktop.scm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 66763016c7..3bb976da47 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -508,7 +508,7 @@ display servers. It supports many different languages and emoji.") #: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)) @@ -628,8 +628,7 @@ database is translated at Transifex.") (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 |