guix-commits
[Top][All Lists]
Advanced

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

09/65: gnu: rust-cexpr-0.3: Don't skip build.


From: guix-commits
Subject: 09/65: gnu: rust-cexpr-0.3: Don't skip build.
Date: Thu, 9 Jul 2020 10:02:01 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit a93ceeac8229005d4d2a06987f80c78df07b7225
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Jul 9 11:10:56 2020 +0300

    gnu: rust-cexpr-0.3: Don't skip build.
    
    * gnu/packages/crates-io.scm (rust-cexpr-0.3)[arguments]: Don't skip
    build. Add custom phase to find clang.
    [inputs]: Add clang.
    (rust-cexpr-0.2)[inputs]: Inherit from rust-cexpr-0.3.
---
 gnu/packages/crates-io.scm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 698f78f..d73a3ba 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -2778,11 +2778,20 @@ archive to be linked into Rustcode.")
          "07fdfj4ff2974y33yixrb657riq9zl9b9h9lr0h7ridhhvxvbrgw"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-nom" ,rust-nom-4.2))
        #:cargo-development-inputs
-       (("rust-clang-sys" ,rust-clang-sys-0.28))))
+       (("rust-clang-sys" ,rust-clang-sys-0.28))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'set-environmental-variable
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((clang (assoc-ref inputs "libclang")))
+               (setenv "LIBCLANG_PATH"
+                       (string-append clang "/lib")))
+             #t)))))
+    (inputs
+     `(("libclang" ,clang)))
     (home-page "https://github.com/jethrogb/rust-cexpr";)
     (synopsis "C expression parser and evaluator")
     (description
@@ -2816,9 +2825,7 @@ archive to be linked into Rustcode.")
              (let ((clang (assoc-ref inputs "libclang")))
                (setenv "LIBCLANG_PATH"
                        (string-append clang "/lib")))
-             #t)))))
-    (inputs
-     `(("libclang" ,clang)))))
+             #t)))))))
 
 (define-public rust-cfg-if-0.1
   (package



reply via email to

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