guix-commits
[Top][All Lists]
Advanced

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

31/31: gnu: idris: Adapt to changed haskell-build-system.


From: guix-commits
Subject: 31/31: gnu: idris: Adapt to changed haskell-build-system.
Date: Sun, 26 Feb 2023 04:44:39 -0500 (EST)

lbraun pushed a commit to branch master
in repository guix.

commit 2c0537d3741447b02914beb8beab100e3464b181
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Sat Feb 11 09:48:06 2023 +0100

    gnu: idris: Adapt to changed haskell-build-system.
    
    …which does not support the “static” output any more.
    
    * gnu/packages/idris.scm (idris)[arguments]: Remove phase
    restore-libidris_rts.
---
 gnu/packages/idris.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/idris.scm b/gnu/packages/idris.scm
index 2a5f63c174..85fb6cc2d2 100644
--- a/gnu/packages/idris.scm
+++ b/gnu/packages/idris.scm
@@ -122,17 +122,7 @@
                (setenv "TASTY_NUM_THREADS" (number->string 
(parallel-job-count)))
                (setenv "IDRIS_CC" ,(cc-for-target)) ;Needed for creating 
executables
                (setenv "PATH" (string-append out "/bin:" (getenv "PATH")))
-               (apply (assoc-ref %standard-phases 'check) args))))
-         (add-before 'check 'restore-libidris_rts
-           (lambda* (#:key outputs #:allow-other-keys)
-             ;; The Haskell build system moves this library to the
-             ;; "static" output.  Idris only knows how to find it in the
-             ;; "out" output, so we restore it here.
-             (let ((out (assoc-ref outputs "out"))
-                   (static (assoc-ref outputs "static"))
-                   (filename "/lib/idris/rts/libidris_rts.a"))
-               (rename-file (string-append static filename)
-                            (string-append out filename))))))))
+               (apply (assoc-ref %standard-phases 'check) args)))))))
     (native-search-paths
      (list (search-path-specification
             (variable "IDRIS_LIBRARY_PATH")



reply via email to

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