diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 5c7d900a09..6bc5fa465c 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -549,8 +549,7 @@ (define file ("" "$JULIA_DEPOT_PATH")))))))) #:make-flags - #~(list (string-append "prefix=" - (assoc-ref %outputs "out")) + #~(list (string-append "prefix=" #$output) ;; Passing the MARCH or JULIA_CPU_TARGET flag is necessary to build ;; binary substitutes for the supported architectures. See also @@ -571,8 +570,7 @@ (define file (_ "JULIA_CPU_TARGET=generic")) "CONFIG_SHELL=bash -x" ;needed to build bundled libraries - (string-append "CC=" - #$(cc-for-target)) + (string-append "CC=" #$(cc-for-target)) #$@(if (target-x86-64?) `("USE_BLAS64=1" @@ -582,8 +580,9 @@ (define file "LIBBLASNAME=libopenblas")) (string-append "UTF8PROC_INC=" - (assoc-ref %build-inputs "utf8proc") - "/include") + (dirname + (search-input-file %build-inputs + "/include/utf8proc.h"))) ;; Make.inc expects a static library for libuv. (string-append "LIBUV=" (search-input-file %build-inputs