From patchwork Mon Sep 2 15:33:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15262 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 EA5521734D; Mon, 2 Sep 2019 16:38:51 +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 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 B424317329 for ; Mon, 2 Sep 2019 16:38:51 +0100 (BST) Received: from localhost ([::1]:37690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPr-00068T-7T for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42790) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMN-0002Ny-JU for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oML-0004jn-H3 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50043) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oML-0004in-AY for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oML-0006eo-70 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 36/48] gnu: console-setup: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:13 +0000 Resent-Message-ID: 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.156743849025303 (code B ref 36477); Mon, 02 Sep 2019 15:35:13 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:50 +0000 Received: from localhost ([127.0.0.1]:58815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLy-0006a1-98 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:50 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:43776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLZ-0006VL-S6 for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:26 -0400 Received: by mail-wr1-f45.google.com with SMTP id y8so14424950wrn.10 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:25 -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=2hUwGhd40iT1PoZDCsybzx2mAEWdbIGvIb4CBmaOLOU=; b=r5kRVLtFZCj5CF3IrzNRAQ1Fbnh1mSjeyh/ck/01LQh9ZliXrnO8lEjm0tgbOjN89O mPIMHPIxQGAooTjoQXsWK3odnyzOPe2hD/uqFDe8r8yTcM/nrpTm3FHtviz4Qv3bAUX5 vlF0MkgcJ0jnV9odiJSyElWa2L1V5kPLnSQUkKa83z9D5y0ZTJByuy91dKr0ZdIXEbWl Fshnszzb3YGqObHDyywviZSDCXPwV81gcBWuUPbW+5HpNQxhsvRQ+zsPopJnyuaWgqgy w/kcyL31A2MnynhZF0QDKsyP6QnJZIatbYlq4ESm5KnxyXrIrRBqwUwX3dqtdgehWqHV ynmg== 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=2hUwGhd40iT1PoZDCsybzx2mAEWdbIGvIb4CBmaOLOU=; b=q9pQ+2JhFScE8KTHLOBAlN1O6h+6vh9+e39bR5k3JGj57n8yBcjUJ70b4aHqwBarTU ipIRWnMfO9tKe4bbCo1x5ZJyiSTklpRlhV/JdwmGHLcqCODJsvvkx1e1Calun1Rg7Ybq rDD+tra9hCoXDkttMzPMLLKgM0/0H7SSVliVgXIrHv0iGLrf90KJXmqg6NP//1ZJ9U3I 48Vdlh9+uExgL8+enMkEidnI0ddNBVRNCNMtKxzzPuQGdtze3nQFhUhw7z8BIUh6lziz eaQECEqEA8CtIERO/EfviSwY35ItcN8bNJZGZu9kQUyyo8y32+3/e+NTmg775OcOa7SO XnYQ== X-Gm-Message-State: APjAAAUise/ERKmvdowokCrXYRaJy/IccYYLhz2TKpo2yFuLChODQ3k4 Gy0GGp5l8eGE2GdCNhUBjyviSccQ X-Google-Smtp-Source: APXvYqxStFWxzMMd8j0tZ0L3pZw7s30aEoDOTk52iXZR4fdTIGd9ikdkmGUQI4Wuiisf6K7ekb9D4g== X-Received: by 2002:adf:ce8e:: with SMTP id r14mr22251276wrn.35.1567438460008; Mon, 02 Sep 2019 08:34:20 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:19 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:21 +0200 Message-Id: <20190902153333.11190-37-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 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xorg.scm (console-setup)[native-inputs]: Add perl, [arguments]: search for bash in both native-inputs and inputs. --- gnu/packages/xorg.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d5d983a8d2..ecd8c29f21 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6412,25 +6412,28 @@ output.") " "))) #t)) (add-before 'build 'make-doubled-bdfs - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (invoke "make" "-C" "Fonts" "doubled_bdfs" (string-append "SHELL=" - (assoc-ref inputs "bash") + (assoc-ref (or native-inputs inputs) + "bash") "/bin/bash")))) (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) (invoke "make" "install-linux" (string-append "prefix=" out) (string-append "SHELL=" - (assoc-ref inputs "bash") + (assoc-ref (or native-inputs inputs) + "bash") "/bin/bash")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("bdftopcf" ,bdftopcf) ("bdfresize" ,bdfresize) - ("sharutils" ,sharutils))) ;for 'uuencode' + ("sharutils" ,sharutils) ;for 'uuencode' + ("perl" ,perl))) (inputs `(("perl" ,perl))) ;used by 'ckbcomp' (synopsis "Set up the Linux console font and keyboard")