From patchwork Thu Aug 19 02:02:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robby Zambito X-Patchwork-Id: 32178 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 9C69F27BC6B; Thu, 19 Aug 2021 03:14:09 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 188C027BC78 for ; Thu, 19 Aug 2021 03:14:09 +0100 (BST) Received: from localhost ([::1]:37400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGXZI-0003lr-3b for patchwork@mira.cbaines.net; Wed, 18 Aug 2021 22:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGXZC-0003la-UK for guix-patches@gnu.org; Wed, 18 Aug 2021 22:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGXZC-0000ir-Ml for guix-patches@gnu.org; Wed, 18 Aug 2021 22:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mGXZC-00081j-Dr for guix-patches@gnu.org; Wed, 18 Aug 2021 22:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50084] [PATCH v3] gnu: waypipe: Clean up phases and dependencies. Resent-From: Robby Zambito Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Aug 2021 02:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50084 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50084@debbugs.gnu.org Cc: paul@apatience.com, Robby Zambito Received: via spool by 50084-submit@debbugs.gnu.org id=B50084.162933921130811 (code B ref 50084); Thu, 19 Aug 2021 02:14:02 +0000 Received: (at 50084) by debbugs.gnu.org; 19 Aug 2021 02:13:31 +0000 Received: from localhost ([127.0.0.1]:57840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mGXYd-00080p-3A for submit@debbugs.gnu.org; Wed, 18 Aug 2021 22:13:31 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:24471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mGXYX-00080U-KS for 50084@debbugs.gnu.org; Wed, 18 Aug 2021 22:13:26 -0400 Received: (Authenticated sender: contact@robbyzambito.me) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 1E60A240003; Thu, 19 Aug 2021 02:13:13 +0000 (UTC) From: Robby Zambito Date: Wed, 18 Aug 2021 22:02:35 -0400 Message-Id: <20210819020234.642522-1-contact@robbyzambito.me> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210818202710.55244-1-contact@robbyzambito.me> References: <20210818202710.55244-1-contact@robbyzambito.me> 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 * gnu/packages/xdisorg.scm (waypipe)[arguments]: Remove unused argument from fix-sleep-path phase. [native-inputs]: Add python, coreutils. [inputs]: Remove python, coreutils. --- Paul, Thank you for the tips. I've removed the unused outputs argument, as well as the out variable. I'm a bit confused as to why test dependencies are supposed to be native-inputs. Aren't the tests run on the target architecture, not the build machine architecture? And aren't native-inputs built for the build machine architecture? I cross compiled the package for armhf-linux and aarch64-linux and it built and tested fine with the changes you suggested, but I also did the same with how I had it previously. Sincerely, Robby gnu/packages/xdisorg.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ba520d35ae..f5b041a590 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -885,19 +885,15 @@ include cursor in the resulting image.") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-sleep-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (coreutils (assoc-ref inputs "coreutils"))) + (lambda* (#:key inputs #:allow-other-keys) + (let ((coreutils (assoc-ref inputs "coreutils"))) (substitute* "./test/startup_failure.py" - (("sleep") - (string-append coreutils "/bin/sleep"))) - #t)))))) + (("sleep") (string-append coreutils "/bin/sleep"))))))))) (native-inputs `(("pkg-config" ,pkg-config) - ("scdoc" ,scdoc))) - (inputs - ;; For tests - `(("python" ,python) + ("scdoc" ,scdoc) + ;; For tests + ("python" ,python) ("coreutils" ,coreutils))) (home-page "https://gitlab.freedesktop.org/mstoeckl/waypipe") (synopsis "Proxy for Wayland protocol applications")