guix-commits
[Top][All Lists]
Advanced

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

16/16: gnu: rust-pcre2-sys-0.2: Unbundle vendored source.


From: guix-commits
Subject: 16/16: gnu: rust-pcre2-sys-0.2: Unbundle vendored source.
Date: Tue, 21 Jan 2020 13:19:36 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit f51fa60b1679c6d06cfe248e901b8df47d71ad77
Author: Efraim Flashner <address@hidden>
AuthorDate: Tue Jan 21 18:49:10 2020 +0200

    gnu: rust-pcre2-sys-0.2: Unbundle vendored source.
    
    * gnu/packages/crates-io.scm (rust-pcre2-sys-0.2)[arguments]: Don't skip
    build. Add custom phase to delete vendored sources.
    [native-inputs]: Add pcre2, pkg-config.
---
 gnu/packages/crates-io.scm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 04a9b49..19a84f5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -28,6 +28,7 @@
   #:use-module (guix packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages jemalloc)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
@@ -7548,11 +7549,23 @@ deserialization, and interpreter in Rust.")
          "0nwdvc43dkb89qmm5q8gw1zyll0wsfqw7kczpn23mljra3874v47"))))
     (build-system cargo-build-system)
     (arguments
-     `(#:skip-build? #t
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
         ("rust-pkg-config" ,rust-pkg-config-0.3)
-        ("rust-cc" ,rust-cc-1.0))))
+        ("rust-cc" ,rust-cc-1.0))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'unbundle-sources
+           (lambda _
+             (delete-file-recursively "pcre2")
+             (delete-file-recursively
+               (string-append "guix-vendor/rust-pcre2-sys-"
+                              ,(package-version rust-pcre2-sys-0.2)
+                              ".tar.gz/pcre2"))
+             #t)))))
+    (native-inputs
+     `(("pcre2" ,pcre2)
+       ("pkg-config" ,pkg-config)))
     (home-page
      "https://github.com/BurntSushi/rust-pcre2";)
     (synopsis "Low level bindings to PCRE2")



reply via email to

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