| Message ID | 20190902153333.11190-39-m.othacehe@gmail.com |
|---|---|
| State | Accepted |
| Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E3F851734D; Mon, 2 Sep 2019 16:37:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AD0C417329 for <patchwork@mira.cbaines.net>; Mon, 2 Sep 2019 16:37:03 +0100 (BST) Received: from localhost ([::1]:37638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org>) id 1i4oO6-00045n-MK for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42818) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i4oMO-0002Oc-Kw for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i4oMN-0004pD-Fr for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50045) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i4oMN-0004mH-BC for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i4oMM-0006f2-5u for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 38/48] gnu: grub: Fix cross-compilation. Resent-From: Mathieu Othacehe <m.othacehe@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:14 +0000 Resent-Message-ID: <handler.36477.B36477.156743849225320@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156743849225320 (code B ref 36477); Mon, 02 Sep 2019 15:35:14 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:52 +0000 Received: from localhost ([127.0.0.1]:58819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1i4oLz-0006aC-TV for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:52 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:36764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <m.othacehe@gmail.com>) id 1i4oLc-0006Vn-3h for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:29 -0400 Received: by mail-wm1-f44.google.com with SMTP id p13so15109903wmh.1 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WL7fLKNr1JLrU6WnaMLxQEHw/j7lWiyZabyrZtNEyqE=; b=KN6SLWwvdchkgTSl33I42ZTBsNCH3I9dIXfKY9bqGpdWAOfM7JtuAsbdDSbdoEzh1B Wh9yVwkiWrEk3DVxdxVA/5xQWDzv17tx9n7BNhhY0sAPV+XspOaTMoJqwZauh8JdIULI g6PP7r3mOlHgBjR/Fd8htTDJvtJc/zUsQwKgN7/2wimpWu+pXMqBLVxUcS7IuEeF5vtD +kjUWBIvNNl1xJHMc/FLpmPnmxGjGeOWElaDoSo6G6SOWLNDOQJ/kuSScBB8qh+XGZ7H F3RBETE4xoWSRHDwrAZoY/0HxJfhR5bxDQOk+Ul6Js7imAvgtOgEK1ShcQn474+tS+Z+ 3kKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WL7fLKNr1JLrU6WnaMLxQEHw/j7lWiyZabyrZtNEyqE=; b=uThqVIxcObIoQs0M7GksQ+9mnYsAd9hyBldy9Kgatr96e3xuZL/JOddfnx+lA5xWe6 I5eO9BfGju63BTXR/kQ7ycOTiOONRiId7XkBEr8L8eJUSCu16TCKrbqEmsiPosDbMzSl FEw2moz1I5h51kk28UWQGPcmDFVndjYLxHoU9b6BRAaYjVNShB544jc0cwkfatiqSCM0 u3izMuIWExcGZpE78TDVrTLV/qbpK6+pOc9fkCZ1mkxEmJhMNq6xbKwnS37IM3Rkblr5 V5UFZps60hevpoqE1oQQKopy9id6uKpyElQ3F3pFlIzJ6Fd43G/70CLM6mznDiPRJUGC mPZw== X-Gm-Message-State: APjAAAX0yljyajsh0JVHSEmoFs5ZKS2ZEbvZNkSC4lNHQBLVPAGDLqzJ SEU5LMm+tCM7n4ASo1J0BizCg6YV X-Google-Smtp-Source: APXvYqwgZgJR2jNyqpu1baDpMvXtHgmxGiF/p/PBaAg2lCRdHi6q7W/cl4PB+EZ8FNbVN3h+CMzAXQ== X-Received: by 2002:a1c:9a46:: with SMTP id c67mr8144679wme.115.1567438462302; Mon, 02 Sep 2019 08:34:22 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:21 -0700 (PDT) From: Mathieu Othacehe <m.othacehe@gmail.com> Date: Mon, 2 Sep 2019 17:33:23 +0200 Message-Id: <20190902153333.11190-39-m.othacehe@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902153333.11190-1-m.othacehe@gmail.com> References: <20190902153333.11190-1-m.othacehe@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Cc: Mathieu Othacehe <m.othacehe@gmail.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-getmail-retrieved-from-mailbox: Patches |
| Series |
Add --target support to guix system
|
expand
|
Mathieu Othacehe <m.othacehe@gmail.com> skribis: > * gnu/packages/bootloaders.scm (grub)[arguments]: Search for unifont in both > native-inputs and inputs. LGTM!
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 41a2de9706..b235e1bc78 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -99,7 +99,7 @@ (list "PYTHON=true") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-stuff - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (substitute* "grub-core/Makefile.in" (("/bin/sh") (which "sh"))) @@ -114,7 +114,9 @@ "/sbin/mdadm\""))) ;; Make the font visible. - (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz") + (copy-file (assoc-ref (or native-inputs inputs) + "unifont") + "unifont.bdf.gz") (system* "gunzip" "unifont.bdf.gz") ;; Give the absolute file name of 'ckbcomp'.