From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mEESI1MBKWFF1gAAgWs5BA (envelope-from ) for ; Fri, 27 Aug 2021 17:14:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id OH/PHlMBKWFyKAAA1q6Kng (envelope-from ) for ; Fri, 27 Aug 2021 15:14:27 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 286D3F6A2 for ; Fri, 27 Aug 2021 17:14:27 +0200 (CEST) Received: from localhost ([::1]:38538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJdYo-0006zX-5C for larch@yhetil.org; Fri, 27 Aug 2021 11:14:26 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630077267; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=kOEf9pqXc2zAhFdvci2GyrxH/TP6BE/1h1gDQiV7uCg=; b=Bc13z7EUzARgxD1cwY9TUXfNKuMJZJ8uV1vGuEkZL4K4yr1N3vs46jcI1L2cWx8LI8o1Fv Mf4DLZ9e+zThGw+tkb0ntS9bgx4IuVncBEKMiUYxQtUqdlsluP9xZI7vR5mlPC6tM5BG5S KpP35TjlVK/yENvTyKoSYlNz+17AY3/L3oylFGUH8pK1Qs902nTYo8MlrtSFYqhLC+s4kF DdbRhgiAkSrOthgEdH0dEvbBKescsri6EE/zNmFj0b/M3yb5dt1b0Vz+v/cG/9S03lPzL+ JeTiuIBMNwQEa7RvMxNSUZZ3iezCr4x+qYj7kYQBdalqVlsPJk0lgM5+UK6BzQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630077267; a=rsa-sha256; cv=none; b=HzIq1vsipxZ/KW2spQaSuzi0PR6j12aArH60RZJuB7XVDFT+X8GKF4vcRET1jHAH71CqSj aFRbLJ5JH5eu9/xh2wmVhYVTg0HDR/v/pCsk/OIOF3cmtV6vHUfBDNjspH2WUF141UJblT 0jr3gx0EFc8enm5l/H89CS/8Yk1UYTXJITwtfG8TNPFYvgjssvSkGkOqsveoeBeH9a3ICq /dmcVRoT7g62sQJPQsDsbYw3qUdI5QwEV9reaM+v8GMwMLT4jkvIi+9xGjHNGQC2A614W3 1LoMJ/SxeJVIGdFNF2LO6qAxpMfwL0CjPFBWyV/WREzQPRg8F3cFqk//HV6dfw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.07 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 286D3F6A2 X-Spam-Score: 2.07 X-Migadu-Scanner: scn0.migadu.com X-TUID: T7Ono56QWCQP * 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) -- 2.31.1