diff mbox series

[bug#50134,core-updates-frozen,11/12] gnu: ocaml4.07-piqi: Fix reference to inputs and output.

Message ID 20210820124848.13293-11-maximedevos@telenet.be
State Accepted
Headers show
Series Fix (assoc-ref ... "out") related Ocaml build failures | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

M Aug. 20, 2021, 12:48 p.m. UTC 
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 mbox series

Patch

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