From patchwork Fri Aug 27 15:13:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 32334 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 DB8C927BBE3; Fri, 27 Aug 2021 16:14:29 +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 AAD9E27BBE1 for ; Fri, 27 Aug 2021 16:14:29 +0100 (BST) Received: from localhost ([::1]:38538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJdYq-0006zX-OJ for patchwork@mira.cbaines.net; Fri, 27 Aug 2021 11:14:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJdYR-0006v3-8l for guix-patches@gnu.org; Fri, 27 Aug 2021 11:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41160) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJdYR-0007yw-1L for guix-patches@gnu.org; Fri, 27 Aug 2021 11:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJdYQ-00073v-U2 for guix-patches@gnu.org; Fri, 27 Aug 2021 11:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50227] [PATCH 2/3] gnu: hyperledger-fabric: Do not assume GOPATH contains a single entry. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Aug 2021 15:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50227@debbugs.gnu.org Received: via spool by 50227-submit@debbugs.gnu.org id=B50227.163007722827100 (code B ref 50227); Fri, 27 Aug 2021 15:14:02 +0000 Received: (at 50227) by debbugs.gnu.org; 27 Aug 2021 15:13:48 +0000 Received: from localhost ([127.0.0.1]:52702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJdYC-000732-60 for submit@debbugs.gnu.org; Fri, 27 Aug 2021 11:13:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJdYA-00072b-CG for 50227@debbugs.gnu.org; Fri, 27 Aug 2021 11:13:46 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50748) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJdY5-0007je-7k for 50227@debbugs.gnu.org; Fri, 27 Aug 2021 11:13:41 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:38004 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJdXy-00023T-3h for 50227@debbugs.gnu.org; Fri, 27 Aug 2021 11:13:39 -0400 From: Marius Bakke Date: Fri, 27 Aug 2021 17:13:29 +0200 Message-Id: <20210827151330.13112-2-marius@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210827151330.13112-1-marius@gnu.org> References: <20210827151330.13112-1-marius@gnu.org> 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/hyperledger.scm (hyperledger-fabric)[arguments]: Adjust for multiple GOPATH entries. --- gnu/packages/hyperledger.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index 82680cd5e4..5c36a81f44 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -77,11 +77,15 @@ #:phases (modify-phases %standard-phases (replace 'build - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) ;; Only linux-amd64 and linux-ppc64le seem to be supported at the moment. (invoke "make" "-j" (number->string (parallel-job-count)) "-C" "src/github.com/hyperledger/fabric" + ;; The build system expects GOPATH to contain a single entry + ;; and uses it to determine the installation directory. + ;; Work around that. + (string-append "GOTOOLS_BINDIR=" (assoc-ref outputs "out") "/bin") "release/linux-amd64"))) (add-after 'install 'install-commands (lambda* (#:key outputs #:allow-other-keys)