From patchwork Sat Dec 30 16:38:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58222 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4EE8D27BBEA; Sat, 30 Dec 2023 16:39:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CDA0D27BBE9 for ; Sat, 30 Dec 2023 16:39:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJcMa-00075W-2R; Sat, 30 Dec 2023 11:39:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJcMX-00074l-TR for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJcMX-0008QH-LI for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJcMY-0002EM-2S for guix-patches@gnu.org; Sat, 30 Dec 2023 11:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 16:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.17039543338512 (code B ref 68150); Sat, 30 Dec 2023 16:39:02 +0000 Received: (at 68150) by debbugs.gnu.org; 30 Dec 2023 16:38:53 +0000 Received: from localhost ([127.0.0.1]:44953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJcMN-0002Cn-Vr for submit@debbugs.gnu.org; Sat, 30 Dec 2023 11:38:53 -0500 Received: from wolfsden.cz ([37.205.8.62]:38666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJcML-0002CJ-Qq for 68150@debbugs.gnu.org; Sat, 30 Dec 2023 11:38:51 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 2420A278F2D; Sat, 30 Dec 2023 16:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954328; bh=wj3/v5IRzU9rQcRGrqhv/VgtLzrWX+Gsg8YK+i5qGxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KIZN1+oyo8L5O+RJIQ8GyZOyXF/f+PhqECe5XAlBBnYkkFr4gWAgNb6htKWh8kiaz aL6J35I5AXZuSuvL023S8062+ESWRP5LXXy9E3FeGBaeLccj61dwX/W9zfi/4nUOkN INAP4o/97jcXxrWb5M/EI/qYux9wk7/5RcoyJOWl1rv2Y3Nlpey4R8mrzLt4ZqAOfO Gco/n2ya38+VNL54Ms62erKryllVCQQj6/bYVKqCyaGS3rgjKgeot3hLdvelPlXchD 3lzYoLmQe1SwcjHG/WqnajU5paN9WvWWt7O/DJLKMqFdUnryV2iTl4G0Tl4FtR1ab4 iVaZk3KsNF7L8LWevoaOxxqBHINotSfz8u5X0lPmM8sipx8pUIjIijXgi8pN3fYBJ7 NcMoI6SiRsgNPUEYB3RKAFaowAM31q9d3Ky69Y9JQYdag0xF1IlveotPw913rKQGfJ aT/t5PambLOXxXxk6UjPDdpJkK1aCZjI4plW4sbzDQXi6OBDAujnEJQ+Kwz8SGBxLB MoZoo6abW+Rrzr8LivvUZuWzt4kN+TehRBOKm0agjCeod2MbGpoxliAZx62JYWBjQG 3q0s0SiNMgQRdc0Ir9sQjbSf4Su+5eks4oztQbCab7q4iDazE7MO30a28sYMLl5FNl 1A+iQhZ8DpBJ7dm6I75lck9o= Received: from localhost (unknown [81.17.16.82]) by wolfsden.cz (Postfix) with ESMTPSA id AE5A5278AC4; Sat, 30 Dec 2023 16:38:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1703954327; bh=wj3/v5IRzU9rQcRGrqhv/VgtLzrWX+Gsg8YK+i5qGxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=i3PVmhZBmhDupOBkmWHhf8tTrUCO/jY2X47guqBI0wJpy/EBOeYU+yR30kZeyr+T5 1mYS3+g+vgd6nSFiqN/NcddBS0IcIEg9/XBzxVwqt03LpvSDsHOIkpuUT1Ek8tFMmV xBDUMT93/iwccR5AZ9IHFD162J9YPmjo0RMI3xQT2xb+RE/lVv9RhVVN3dN19aqZfG Ns+gffeFUQT3/evlb/orZ+fE4bB6wVeFsapEB1CJMsJHuATMT7EAxy0YwROMplN1gu PWSHeI2O2sIyjwwKzsPvRLCFbFSPTa+FEhfcQLHafpAgXZHVTmTNEz6FImpY8zh7P8 s04sOjS5fgrL1ZAlAD8lJ6AFAD/BlUMSEt/HO1FRtW1o1T0Cq4M6h+1DMnfUUH3jHt sHkXhI70nLzp5dr1GgFCaOJzRNW9BB0a4cgY8RlF8ql9ALeHivyCxTX3XoMbkKiJ1C iAD87yuL5mVAYa4eanbcgCH+9ozCovNfOZktGSVcYYzQpAC0GNdL3UL+rfuV4wW9ON w6b7pkgKyzX+qBfGWcyoVmlk0oWoKn2+Wh2amA1oU3/u9HlMA6Wj3KEkTmOxYwy09c 5JDXYFwmUDWmaJVAPK8kC+DiF2EdaIDCSIanfc9cmk2nyOcOLFybMuSx9JAnN0mnON ifTseTqSjuQGqlYfCKIqBFxc= Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f46ad944; Sat, 30 Dec 2023 16:38:46 +0000 (UTC) From: Tomas Volf <~@wolfsden.cz> Date: Sat, 30 Dec 2023 17:38:36 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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)