diff mbox series

[bug#68150,v2,2/8] gnu: netsurf: Actually use glib-or-gtk-build-system.

Message ID c1524d27f8384098ef301c1902e129fa3806f460.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 #:modules argument was based on %glib-or-gtk-build-system-modules, which,
despite the name, should go into #:imported-modules.  When put into #:modules,
it leads to following warning:

    WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system)

Due to the definition of %glib-or-gtk-build-system-modules

    `((guix build glib-or-gtk-build-system)
      ,@%gnu-build-system-modules)

It results in %standard-phases from gnu-build-system being used, effectively
turning glib-or-gtk-build-system with #:modules set to
%glib-or-gtk-build-system-modules into gnu-build-system.

The solution is to use the (now) exported default value of
 #:modules (%glib-or-gtk-build-system-default-modules) as a base of the
 #:modules.

* gnu/packages/web.scm (netsurf)[arguments]<#:modules>: Use
%glib-or-gtk-build-system-default-modules instead of
%glib-or-gtk-build-system-modules.

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

 gnu/packages/web.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.46.0
diff mbox series

Patch

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 552abf83c5..0ed88c11cf 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6265,7 +6265,7 @@  (define-public netsurf
                   (ice-9 match)
                   (srfi srfi-1)
                   (sxml simple)
-                  ,@%glib-or-gtk-build-system-modules)
+                  ,@%glib-or-gtk-build-system-default-modules)
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)