Subject: [bug#50134] [PATCH core-updates-frozen 04/12] gnu: ocaml-dose3: Fix reference to inputs and output.

From: Maxime Devos <[email-masked]>
Date: Fri, 20 Aug 2021 14:48:40 +0200

The package [email-masked]' (indirect dependency of ocaml-dose3)
fails to build so this patch could not be tested.

* gnu/packages/ocaml.scm
  (ocaml-dose3)[arguments]<#:make-flags>: Use #$output.
  (ocaml-dose3)[arguments]<#:configure-flags>: Don't use %build-inputs.
---
 gnu/packages/ocaml.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c97f633cbe..0043e9fbee 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -44,6 +44,7 @@
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages compression)
@@ -644,13 +645,11 @@ underlying solvers like Cplex, Gurobi, Lpsolver, Glpk, CbC, SCIP or WBO.")
     (build-system ocaml-build-system)
     (arguments
      `(#:configure-flags
-       (list (string-append "SHELL="
-                            (assoc-ref %build-inputs "bash")
-                            "/bin/sh"))
+       ,#~(list (string-append "SHELL="
+                               #+(file-append (canonical-package bash-minimal)
+                                              "/bin/sh")))
        #:make-flags
-       (list (string-append "LIBDIR="
-                            (assoc-ref %outputs "out")
-                            "/lib/ocaml/site-lib"))
+       ,#~(list (string-append "LIBDIR=" #$output "/lib/ocaml/site-lib"))
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-test-script
-- 
2.33.0