From patchwork Fri Aug 20 12:48:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 32204 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 001FB27BC78; Fri, 20 Aug 2021 13:50:48 +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 52A0027BC6B for ; Fri, 20 Aug 2021 13:50:48 +0100 (BST) Received: from localhost ([::1]:57758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3yx-0000LL-Ac for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:50:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yE-0000JV-Dt for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49915) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yE-0001IA-6m for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yE-0002eW-57 for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 01/12] gnu: ocaml: Fix reference to output. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:50:02 +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.162946375010050 (code B ref 50134); Fri, 20 Aug 2021 12:50:02 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:10 +0000 Received: from localhost ([127.0.0.1]:33200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xF-0002as-HY for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:10 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xA-0002aP-5l for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:00 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406oouFk; Fri, 20 Aug 2021 14:48:55 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:37 +0200 Message-Id: <20210820124848.13293-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <215b0088e542b2fb9bcf3be9ff74c5874770f878.camel@telenet.be> References: <215b0088e542b2fb9bcf3be9ff74c5874770f878.camel@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629463735; bh=UIKRw10Wr3sgrJESReW/JjE/r5Rf8tD7+fR5sMoaw2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oLqbAELJLWDXxSTp+QZnAo4lJgF/+f0GkSz2xGYHIm5F14VaU0aRleYbN02C1cSUM 4GjfurU3qfst5fp/b8MiH5vELloZW69BZsDJXL7NGwyKiRmDLN6JkXsainbWywMwOH izTJwU+0jSUAZkj0IIGG/vBNrdOjNKcK0jSljwyvzWqJGp1Z8ZvhkvpfoVqt0a3IvK BNuLMlIkKTTz+Y6Dh2jzgppLdZhWlWx8rCdKG+ugcXGfiAX0pRCGWQIuyJjJFTXGtb Dvu0xKJ6fBWXp505d9eF2s6bpIj7BEZ1pVSOtxz67IQY4XJqtUf5QTmriZ9K1/mz7y gF2qUha4rrYdg== 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/ocaml.scm (dune-boot)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 183f88dd01..b8d52bb283 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Ivan Gankevich +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -87,6 +88,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system ocaml) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -1620,10 +1622,10 @@ full_split, cut, rcut, etc..") (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc - #:make-flags (list "release" - (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "LIBDIR=" (assoc-ref %outputs "out") - "/lib/ocaml/site-lib")) + #:make-flags ,#~(list "release" + (string-append "PREFIX=" #$output) + (string-append "LIBDIR=" #$output + "/lib/ocaml/site-lib")) #:phases (modify-phases %standard-phases (replace 'configure