From c5fd5e7dfee42380ef423bd5a79b9a3a40d15088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 8 Jan 2025 10:20:05 +0100 Subject: [PATCH] gnu: julia: Avoid old-style input and output alists. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia.scm (julia)[arguments]: Remove references to ‘%outputs’ and ‘%build-inputs’ in #:make-flags. Change-Id: I400c038437a1f9f8bc010d22aa874c892958cfe2 --- gnu/packages/julia.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time")) ("" "$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 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time")) (_ "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 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time")) "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