From patchwork Mon Mar 21 12:17:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 37970 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 D38B827BBEA; Mon, 21 Mar 2022 12:18:55 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 998A027BBE9 for ; Mon, 21 Mar 2022 12:18:55 +0000 (GMT) Received: from localhost ([::1]:54304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWGzu-0007Ec-Cl for patchwork@mira.cbaines.net; Mon, 21 Mar 2022 08:18:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWGz6-00079K-24 for guix-patches@gnu.org; Mon, 21 Mar 2022 08:18:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWGz4-0000RU-Tf for guix-patches@gnu.org; Mon, 21 Mar 2022 08:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nWGz4-0007N1-Q7 for guix-patches@gnu.org; Mon, 21 Mar 2022 08:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54471] [PATCH core-updates v2 3/3] build-system: font: Move unpack utilities to build-inputs. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Mar 2022 12:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54471 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , Arun Isaac , 54471@debbugs.gnu.org Received: via spool by 54471-submit@debbugs.gnu.org id=B54471.164786505128257 (code B ref 54471); Mon, 21 Mar 2022 12:18:02 +0000 Received: (at 54471) by debbugs.gnu.org; 21 Mar 2022 12:17:31 +0000 Received: from localhost ([127.0.0.1]:36064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWGyZ-0007Lh-Ip for submit@debbugs.gnu.org; Mon, 21 Mar 2022 08:17:31 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:51774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWGyU-0007L2-2i for 54471@debbugs.gnu.org; Mon, 21 Mar 2022 08:17:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jEmCr48ruxC/yY7jAdOU5mGuU7m2LD+QKma9HD0s9+g=; b=fE3zCJXJZK2LTHne8750orZOJ5 x6+0iarePKyT38cz8KrY2gUivJKGPu2GL0zOQ0JFaLjYb0+f5+Roh+vFS+3P2CLnN/zE54f1JBeMT 9/bMOvs0Ivb2bHw0GBwWvEngq524MDvDZVqrIJb7jiElojz8nxnt+rfI6bndJOH4q41mqIsxlMXji IpmMVSdgo6bBhbcAtJK0qtFGYB9qbwsSQ/tEmVAdmI+kHhWb/hlf0FY8J8oh6nd/o1XJexpFPGpT0 2VQ+buqSYJ1YPZ9KQ6IAB0aZy1xxuA+3v+XTsNI9Df75R1DSufZ+mxfXhGij780h/ZLes/SQsdzzF WmNMRCEg==; Received: from [192.168.2.1] (port=5304 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1nWGyR-00023f-Pt; Mon, 21 Mar 2022 17:47:23 +0530 From: Arun Isaac Date: Mon, 21 Mar 2022 17:47:22 +0530 Message-Id: <20220321121722.12575-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.34.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" X-getmail-retrieved-from-mailbox: Patches * guix/build-system/font.scm (lower): Move tar, gzip, bzip2, unzip and xz from host-inputs to build-inputs. --- guix/build-system/font.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index 74dc80b5db..c43fb9a542 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2022 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,20 +54,20 @@ (define private-keywords (bag (name name) (system system) - (host-inputs `(,@(if source - `(("source" ,source)) - '()) - ,@inputs - ,(list "tar" (module-ref (resolve-interface '(gnu packages base)) 'tar)) - ,@(let ((compression (resolve-interface '(gnu packages compression)))) - (map (match-lambda - ((name package) - (list name (module-ref compression package)))) - `(("gzip" gzip) - ("bzip2" bzip2) - ("unzip" unzip) - ("xz" xz)))))) - (build-inputs native-inputs) + (host-inputs inputs) + (build-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@native-inputs + ,(list "tar" (module-ref (resolve-interface '(gnu packages base)) 'tar)) + ,@(let ((compression (resolve-interface '(gnu packages compression)))) + (map (match-lambda + ((name package) + (list name (module-ref compression package)))) + `(("gzip" gzip) + ("bzip2" bzip2) + ("unzip" unzip) + ("xz" xz)))))) (outputs outputs) (build font-build) (arguments (strip-keyword-arguments private-keywords arguments))))