guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

11/13: gnu: ocaml4.07-piqi: Fix reference to inputs and output.


From: guix-commits
Subject: 11/13: gnu: ocaml4.07-piqi: Fix reference to inputs and output.
Date: Fri, 20 Aug 2021 12:34:08 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit 8717b34cd42548f6071acfb2f9ed0491b8cc63e1
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Aug 20 14:48:47 2021 +0200

    gnu: ocaml4.07-piqi: Fix reference to inputs and output.
    
    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.
    
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 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 7385d6e..e89c1ad 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]