From patchwork Tue Sep 26 19:04:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 54337 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 8A8CB27BBE9; Tue, 26 Sep 2023 20:40:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 2A82C27BBE2 for ; Tue, 26 Sep 2023 20:40:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlDtZ-0006lx-Nh; Tue, 26 Sep 2023 15:38:57 -0400 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 1qlDtW-0006gJ-GD for guix-patches@gnu.org; Tue, 26 Sep 2023 15:38:54 -0400 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 1qlDtT-0006MJ-22 for guix-patches@gnu.org; Tue, 26 Sep 2023 15:38:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlDtf-000119-HT; Tue, 26 Sep 2023 15:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66217] [PATCH 05/22] gnu: qmk: Add many missing inputs and add more commands to PATH. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Tue, 26 Sep 2023 19:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66217 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66217@debbugs.gnu.org Cc: Maxim Cournoyer , Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 66217-submit@debbugs.gnu.org id=B66217.16957570983614 (code B ref 66217); Tue, 26 Sep 2023 19:39:03 +0000 Received: (at 66217) by debbugs.gnu.org; 26 Sep 2023 19:38:18 +0000 Received: from localhost ([127.0.0.1]:49807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlDsv-0000w8-99 for submit@debbugs.gnu.org; Tue, 26 Sep 2023 15:38:17 -0400 Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]:51248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlDsr-0000us-3M for 66217@debbugs.gnu.org; Tue, 26 Sep 2023 15:38:13 -0400 Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-7740cedd4baso632962285a.2 for <66217@debbugs.gnu.org>; Tue, 26 Sep 2023 12:37:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695757074; x=1696361874; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kT4IQMm+w3i4d66/bdbu2lRKakb1z4cbKmgOL242FEc=; b=ZgyZzfXBo58asOn8MjVwv9jfKQztpqb+o6UsKlkcj3wg0FrIdaE5DeEa8JrxwgIDsd iwlCOAfju7/k/aCjuLxaIPDMl4WxIDZBaU4NNMBy3tCP/1IUN+gjKmu5bsq5AskkMuM9 dmccGdzvlUweRJy+DUbb1JXAUdLX+3xRYEXLlaKVS9PWzNJzfN16R+eF+AZpczvkthdw ywY/lW/nvNylHSarqbQhBNkRuSkjZIDv81azloQjKqHQsF+KjNe6kIL/8o9MPOgyXdw5 r7ZilfzG96XcJW0470Hhc6X/X3TcN2anMtF7JxTNc3L0qoUHhBCVaRLsQcuHbcSrpRU0 YDxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695757074; x=1696361874; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kT4IQMm+w3i4d66/bdbu2lRKakb1z4cbKmgOL242FEc=; b=Xkc603dhOBhG6DWUGUGzCZ1ooB9uW3OlEoDpBXdmU1WtmMxRaPyElUjZLLURYs3K1T 3RebNAIcx4gWlMGO40Q+gZ+vNaWlq0RtzQ6Q2tNKGkGbhYT9PPDJq9yp5OEcSoYrxXw3 048A2SiiW+4Mc+Cwpoh0IzRODzgMJMn9zsvr0lBurWZWrFxtVuAMqqYY1iV9Qay/TMza UFiHvwmBq1H/GIyTzqomlaYGUEp/KFtXVyURlEpsTmkS57gTZPbFlY6k9l43JUB5qoJy fPXVOhUIuiZJ/Y5Z939zsQfzXtD9G2UO7lS86ty76UImGiVLU+fQUIaaJHd2jK3xgusK HnCw== X-Gm-Message-State: AOJu0YwGxc6ND1eFkNP3lQuVdLedRu7Y4pwyqtvR+m6tB8r5yTMdEE+E xun23Znsry4VZq7Zh9IhRUxzCqlA0LA= X-Google-Smtp-Source: AGHT+IEo+dlG/HFJxblr6GL9A4Z0qO0sj/YKxHSNDC/KhXjFE4/PacAS/cw6PSiQ6jOKevZD+IOluA== X-Received: by 2002:a05:620a:1424:b0:76d:2725:f36f with SMTP id k4-20020a05620a142400b0076d2725f36fmr9889229qkj.71.1695757074190; Tue, 26 Sep 2023 12:37:54 -0700 (PDT) Received: from localhost.localdomain (dsl-10-130-229.b2b2c.ca. [72.10.130.229]) by smtp.gmail.com with ESMTPSA id a13-20020a05620a16cd00b0076cbcf8ad3bsm2887595qkn.55.2023.09.26.12.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 12:37:53 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 26 Sep 2023 15:04:28 -0400 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 * gnu/packages/firmware.scm (qmk) [inputs]: Add bash-minimal, dfu-util, diffutils, gawk, gnu-make, grep and python. [arguments]: Add them to PATH in the wrapper in the wrap-path phase. Also capture avr-ar in the PATH. Add CROSS_C_INCLUDE_PATH and CROSS_LIBRARY_PATH to the wrapper. --- gnu/packages/firmware.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index c1f6c8ea5e2..1957fb8aac4 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -57,6 +57,7 @@ (define-module (gnu packages firmware) #:use-module (gnu packages elf) #:use-module (gnu packages flashing-tools) #:use-module (gnu packages flex) + #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -1241,19 +1242,31 @@ (define-public qmk #:phases #~(modify-phases %standard-phases (add-after 'wrap 'wrap-path + ;; Wrap all the tools needed for the 'setup' and 'compile' actions + ;; (tested with the 'ergodox_ez' keyboard). (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/qmk") `("PATH" prefix ,(map (compose dirname (cut search-input-file inputs <>)) - '("bin/avr-gcc" + '("bin/avr-ar" + "bin/avr-gcc" "bin/avrdude" + "bin/awk" + "bin/cmp" "bin/dfu-programmer" + "bin/dfu-util" "bin/git" + "bin/grep" + "bin/make" + "bin/python3" + "bin/sh" ;; TODO: Remove after git is wrapped with these. "bin/basename" "bin/sed" - "bin/uname"))))))))) + "bin/uname"))) + `("CROSS_C_INCLUDE_PATH" = (,(getenv "CROSS_C_INCLUDE_PATH"))) + `("CROSS_LIBRARY_PATH" = (,(getenv "CROSS_LIBRARY_PATH"))))))))) ;; The inputs are not propagated since qmk is to be used strictly as a ;; command. (inputs @@ -1261,8 +1274,15 @@ (define-public qmk ;; compilation errors in some firmware otherwise. (list (make-avr-toolchain #:xgcc gcc-8) avrdude + bash-minimal dfu-programmer + dfu-util + diffutils git-minimal ;for the clone action + gawk + gnu-make + grep + python python-dotty-dict python-hid python-hjson