me/guix
Archived
1
0
Fork 0
Code Activity

gnu: rust-pcre2-sys-0.2: Delete vendored code.

Browse source 
* gnu/packages/crates-io.scm (rust-pcre2-sys-0.2)[source]: Delete
vendored code.
[arguments]: Remove custom phase.
(rust-pcre2-0.2, rust-grep-pcre2-0.1)[arguments]: Enable build.
[native-inputs]: Add pkg-config, pcre2.
This commit is contained in:
Efraim Flashner 2020-01-25 21:57:31 +02:00
parent d6dde77d7f
commit d0c4d1abfe
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/crates-io.scm
View file

@ -4408,10 +4408,12 @@ the regex engine it uses pluggable.")
"1wjc3gsan20gapga8nji6jcrmwn9n85q5zf2yfq6g50c7abkc2ql")))) "1wjc3gsan20gapga8nji6jcrmwn9n85q5zf2yfq6g50c7abkc2ql"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:skip-build? #t `(#:cargo-inputs
#:cargo-inputs
(("rust-grep-matcher" ,rust-grep-matcher-0.1) (("rust-grep-matcher" ,rust-grep-matcher-0.1)
("rust-pcre2" ,rust-pcre2-0.2)))) ("rust-pcre2" ,rust-pcre2-0.2))))
(native-inputs
`(("pcre2" ,pcre2)
("pkg-config" ,pkg-config)))
(home-page (home-page
"https://github.com/BurntSushi/ripgrep") "https://github.com/BurntSushi/ripgrep")
(synopsis "Use PCRE2 with the grep crate") (synopsis "Use PCRE2 with the grep crate")
@ -7490,12 +7492,14 @@ deserialization, and interpreter in Rust.")
"103i66a998g1fjrqf9sdyvi8qi83hwglz3pjdcq9n2r207hsagb0")))) "103i66a998g1fjrqf9sdyvi8qi83hwglz3pjdcq9n2r207hsagb0"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:skip-build? #t `(#:cargo-inputs
#:cargo-inputs
(("rust-libc" ,rust-libc-0.2) (("rust-libc" ,rust-libc-0.2)
("rust-log" ,rust-log-0.4) ("rust-log" ,rust-log-0.4)
("rust-pcre2-sys" ,rust-pcre2-sys-0.2) ("rust-pcre2-sys" ,rust-pcre2-sys-0.2)
("rust-thread-local" ,rust-thread-local-0.3)))) ("rust-thread-local" ,rust-thread-local-0.3))))
(native-inputs
`(("pcre2" ,pcre2)
("pkg-config" ,pkg-config)))
(home-page "https://github.com/BurntSushi/rust-pcre2") (home-page "https://github.com/BurntSushi/rust-pcre2")
(synopsis "High level wrapper library for PCRE2") (synopsis "High level wrapper library for PCRE2")
(description (description
@ -7514,23 +7518,16 @@ deserialization, and interpreter in Rust.")
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0nwdvc43dkb89qmm5q8gw1zyll0wsfqw7kczpn23mljra3874v47")))) "0nwdvc43dkb89qmm5q8gw1zyll0wsfqw7kczpn23mljra3874v47"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "pcre2") #t))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2) (("rust-libc" ,rust-libc-0.2)
("rust-pkg-config" ,rust-pkg-config-0.3) ("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 (native-inputs
`(("pcre2" ,pcre2) `(("pcre2" ,pcre2)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))