From: Tomas Volf <~@wolfsden.cz>
To: 68150@debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>
Subject: [bug#68150] [PATCH 1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules.
Date: Sat, 30 Dec 2023 17:38:35 +0100 [thread overview]
Message-ID: <c005e76b76bf4f5775e6a6750bdf2fc583bf3de4.1703953716.git.~@wolfsden.cz> (raw)
In-Reply-To: <cover.1703953716.git.~@wolfsden.cz>
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
---
guix/build-system/glib-or-gtk.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
index 726d19efad..38a6eeb178 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."
--
2.41.0
next prev parent reply other threads:[~2023-12-30 16:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-30 16:33 [bug#68150] [PATCH 0/8] Fix usage of glib-or-gtk-build-system Tomas Volf
2023-12-30 16:38 ` Tomas Volf [this message]
2023-12-30 16:38 ` [bug#68150] [PATCH 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system Tomas Volf
2023-12-30 16:38 ` [bug#68150] [PATCH 3/8] gnu: libreoffice: " Tomas Volf
2023-12-30 16:38 ` [bug#68150] [PATCH 4/8] gnu: sugar: Dehardcode #:modules Tomas Volf
2023-12-30 16:38 ` [bug#68150] [PATCH 5/8] gnu: sugar-datastore: " Tomas Volf
2023-12-30 16:38 ` [bug#68150] [PATCH 6/8] gnu: sugar-toolkit-gtk3: " Tomas Volf
2023-12-30 16:38 ` [bug#68150] [PATCH 7/8] gnu: nimf: " Tomas Volf
2023-12-30 16:38 ` [bug#68150] [PATCH 8/8] gnu: hime: " Tomas Volf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='c005e76b76bf4f5775e6a6750bdf2fc583bf3de4.1703953716.git.~@wolfsden.cz' \
--to=~@wolfsden.cz \
--cc=68150@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.