From patchwork Fri Oct 1 14:21:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33504 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 B93E827BBE3; Fri, 1 Oct 2021 15:28:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 808BF27BBE1 for ; Fri, 1 Oct 2021 15:28:13 +0100 (BST) Received: from localhost ([::1]:47034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWG-0004d9-Hj for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0002AP-VG for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45418) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUE-0000WW-5n for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUE-0005gx-2c for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 12/38] gnu: gobject-introspection: Move things to native-inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831421623 (code B ref 50905); Fri, 01 Oct 2021 14:26:06 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:14 +0000 Received: from localhost ([127.0.0.1]:56917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005cb-7v for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:14 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tm-7H for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLM; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:14 +0200 Message-Id: <20211001142140.17027-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=eThyqZx1j58+TnVqKMEs4M8T54v78kMtximnREY6a9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UmzNTIk+QEigj3/YjkoC7GsM7vtHY/tP673XnateJiEp1FbWFpV5G1EjT7iS8+G2i UGhUUOl0v0sJY0se3y6UXRq0VarVCBveZJV0qIfPNtvMuogyIlTdly7lq35Om9zqmQ bCIMajLSiOAZyIUJPQwQl/jmIC73bbG8Z3gu72Cg4osaShdKvnfZFNJP9vAtnK8xoe LIJiD0FbCuOofyuLfBV6ALjhanv3yShbMFGcUn+iX1dNnC/2ks3zqhyKkPSktrxHlI esvXx+klvbCR2vY0PgJdsiFZOexMF0JIzc1PRBMDWgYqMMNQkhwkDdPIJawdabUKGc 6Nh/K9woKzfQQ== 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (gobject-introspection)[native-inputs]: Make 'bison' and 'flex' inputs unconditional ... (gobject-introspection)[inputs]: ... and unconditionally remove them here. --- gnu/packages/glib.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bdcc108ac1..cbaece6cf1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -486,18 +486,12 @@ be used when cross-compiling." (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Unconditionally place "flex" and "bison" - ;; in 'native-inputs'. - ,@(if (%current-target-system) - `(("bison" ,bison) - ("flex" ,flex)) - '()))) + ("bison" ,bison) + ("flex" ,flex))) (inputs `(,@(if (%current-target-system) `(("python" ,python)) - `(("bison" ,bison) - ("flex" ,flex) - ("python" ,python-wrapper))) + `(("python" ,python-wrapper))) ("zlib" ,zlib))) (propagated-inputs `(("glib" ,glib)