diff mbox series

[bug#68150,v2,1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules.

Message ID 44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz
State New
Headers show
Series [bug#68150,v2,1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. | expand

Commit Message

Tomas Volf Oct. 6, 2024, 5 p.m. UTC 
The list of modules used by default was not public, so users of this build
system had to pick between copy&pasting the list, or using
%glib-or-gtk-build-system-modules.  The former is sub-optimal, since it is
hard to keep it in sync.  The latter is just wrong and leads to basically
fall-backing to gnu-build-system.

The solution is to export the default list giving the users option to use it
directly.

* guix/build-system/glib-or-gtk.scm
(%glib-or-gtk-build-system-default-modules): Renamed from %default-modules.
(define-module): Export it.
(glib-or-gtk-build), (glib-or-gtk-cross-build): Use it.

Change-Id: I331b2a3f0bdc3ce14eb9f2f80605e7873369168d
---
Rebase on latest master.

 guix/build-system/glib-or-gtk.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--
2.46.0
diff mbox series

Patch

diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
index 5d026ec5ab..6c69a950e8 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -30,7 +30,8 @@  (define-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system)
   #:use-module (guix build-system gnu)
   #:use-module (guix packages)
-  #:export (%glib-or-gtk-build-system-modules
+  #:export (%glib-or-gtk-build-system-default-modules
+            %glib-or-gtk-build-system-modules
             glib-or-gtk-build
             glib-or-gtk-cross-build
             glib-or-gtk-build-system)
@@ -64,7 +65,7 @@  (define-module (guix build-system glib-or-gtk)
 ;;
 ;; Code:

-(define %default-modules
+(define %glib-or-gtk-build-system-default-modules
   ;; Build-side modules made available in the build environment.
   '((guix build glib-or-gtk-build-system)
     (guix build utils)))
@@ -144,7 +145,7 @@  (define* (glib-or-gtk-build name inputs
                             (glib-or-gtk-wrap-excluded-outputs ''())
                             (system (%current-system))
                             (imported-modules %glib-or-gtk-build-system-modules)
-                            (modules %default-modules)
+                            (modules %glib-or-gtk-build-system-default-modules)
                             allowed-references
                             disallowed-references)
   "Build SOURCE with INPUTS.  See GNU-BUILD for more details."
@@ -219,7 +220,7 @@  (define* (glib-or-gtk-cross-build name
                                   (system (%current-system))
                                   (build (nix-system->gnu-triplet system))
                                   (imported-modules %glib-or-gtk-build-system-modules)
-                                  (modules %default-modules)
+                                  (modules %glib-or-gtk-build-system-default-modules)
                                   allowed-references
                                   disallowed-references)
   "Cross-build SOURCE with INPUTS.  See GNU-BUILD for more details."