me
/
guix
Archived
1
0
Fork 0
Code

gnu: ocaml-dose3: Fix reference to inputs and output. 

The package 'lablgtk@2.8.10' (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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Maxime Devos 2021-08-20 14:48:40 +02:00 committed by Mathieu Othacehe
parent 04b909829c
commit 96ca16857f
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/ocaml.scm
View File

@ -44,6 +44,7 @@
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages compression) #: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) (build-system ocaml-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "SHELL=" ,#~(list (string-append "SHELL="
(assoc-ref %build-inputs "bash") #+(file-append (canonical-package bash-minimal)
"/bin/sh")) "/bin/sh")))
#:make-flags #:make-flags
(list (string-append "LIBDIR=" ,#~(list (string-append "LIBDIR=" #$output "/lib/ocaml/site-lib"))
(assoc-ref %outputs "out")
"/lib/ocaml/site-lib"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-test-script (add-after 'unpack 'fix-test-script