[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68150] [PATCH 2/8] gnu: netsurf: Actually use glib-or-gtk-build-sys
From: |
Tomas Volf |
Subject: |
[bug#68150] [PATCH 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system. |
Date: |
Sat, 30 Dec 2023 17:38:36 +0100 |
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
---
gnu/packages/web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 67f59ca9f9..df476e7ccd 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5927,7 +5927,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)
--
2.41.0
- [bug#68150] [PATCH 0/8] Fix usage of glib-or-gtk-build-system, Tomas Volf, 2023/12/30
- [bug#68150] [PATCH 5/8] gnu: sugar-datastore: Dehardcode #:modules., Tomas Volf, 2023/12/30
- [bug#68150] [PATCH 4/8] gnu: sugar: Dehardcode #:modules., Tomas Volf, 2023/12/30
- [bug#68150] [PATCH 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system.,
Tomas Volf <=
- [bug#68150] [PATCH 1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules., Tomas Volf, 2023/12/30
- [bug#68150] [PATCH 6/8] gnu: sugar-toolkit-gtk3: Dehardcode #:modules., Tomas Volf, 2023/12/30
- [bug#68150] [PATCH 3/8] gnu: libreoffice: Actually use glib-or-gtk-build-system., Tomas Volf, 2023/12/30
- [bug#68150] [PATCH 8/8] gnu: hime: Dehardcode #:modules., Tomas Volf, 2023/12/30
- [bug#68150] [PATCH 7/8] gnu: nimf: Dehardcode #:modules., Tomas Volf, 2023/12/30