guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: libwhich: Compile natively, too.


From: guix-commits
Subject: 01/02: gnu: libwhich: Compile natively, too.
Date: Fri, 13 Nov 2020 13:43:43 -0500 (EST)

nckx pushed a commit to branch master
in repository guix.

commit db2f95f1c24f5bfd05aa4c062cc6e7a32088345c
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Nov 13 15:12:52 2020 +0100

    gnu: libwhich: Compile natively, too.
    
    This follows up on commit 12424b3ecfdf401c72804ddfa4b2fa2d8b1b68e5.
    
    * gnu/packages/julia.scm (libwhich)[arguments]: Fix non-cross
    compilation.
---
 gnu/packages/julia.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 5cb4e53..d8a6d7a 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -201,9 +201,10 @@
        (modify-phases %standard-phases
          (delete 'configure)
          (add-before 'check 'set-ld-library-path
-           (lambda* (#:key native-inputs #:allow-other-keys)
+           (lambda* (#:key native-inputs inputs #:allow-other-keys)
              (setenv "LD_LIBRARY_PATH"
-                     (string-append (assoc-ref native-inputs "zlib") "/lib"))))
+                     (string-append (assoc-ref (or native-inputs inputs) 
"zlib")
+                                    "/lib"))))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]