From patchwork Fri Aug 20 12:48:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32214 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 19F0027BC78; Fri, 20 Aug 2021 13:54:12 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,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 DEF7B27BC6B for ; Fri, 20 Aug 2021 13:54:11 +0100 (BST) Received: from localhost ([::1]:35354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH42F-0004SH-2F for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:54:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yL-0000SN-MZ for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yH-0001Lp-Rc for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yH-0002fc-QW for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 11/12] gnu: ocaml4.07-piqi: Fix reference to inputs and output. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:50:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50134 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50134@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50134-submit@debbugs.gnu.org id=B50134.162946375810126 (code B ref 50134); Fri, 20 Aug 2021 12:50:05 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:18 +0000 Received: from localhost ([127.0.0.1]:33224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xW-0002d9-0x for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:18 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xH-0002aS-T3 for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406op3H3; Fri, 20 Aug 2021 14:49:03 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:47 +0200 Message-Id: <20210820124848.13293-11-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210820124848.13293-1-maximedevos@telenet.be> References: <215b0088e542b2fb9bcf3be9ff74c5874770f878.camel@telenet.be> <20210820124848.13293-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629463743; bh=b4yk15kPihj7+HrMxPspeofrfxEYgzpF/ap2ULepdw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VPxTAC1yuuL5kAQpJ6IuDBwqqD/5wkg0OZ6kgFkIdjkJ2HmayqV0tgCpgVkeXOUJF 1A8T2dvy8jWpuXrv+AEYPs1Gf71RL9LVI4MzfiR3S5PWvvifC8nt2cI0IhjvUIUwBc SxenAMd2ttI8p1zzYMgr6Sw0qcVdBsxF55eO9wCn8ZGBXtXoXB1DNSr9Ey96OdVlMz heKG86XUKmmzXlkpfXyM/+FwFCa8u9Zz8IZT6VDt0T6jsZMmf2h1p2VFCH+VdR6Iyd D1WZM8n/BvZD1mvZhTn6jNE5hkgV0XB+SuZo41n+eqsGNlHmFzBGpBeoZt6UdMW6rn X5x6LIOLr4F9A== 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 The package 'lablgtk@2.8.10' (indirect dependency of ocaml4.07-piqi) fails to build so this patch could not be tested. * gnu/packages/ocaml.scm (ocaml4.07-piqi)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7385d6e413..e89c1adbb9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3704,9 +3704,10 @@ and 4 (random based) according to RFC 4122.") (build-system ocaml-build-system) (arguments `(#:make-flags - (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) - (string-append "SHELL=" (assoc-ref %build-inputs "bash") - "/bin/sh")) + ,#~(list (string-append "DESTDIR=" #$output) + (string-append "SHELL=" + #+(file-append (canonical-package bash-minimal) + "/bin/sh"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-files-writable