ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: tokei: Unbundle some dependencies.

Browse source 
* gnu/packages/rust-apps.scm (tokei)[arguments]: Add custom phase to
delete vendored sources and set environment variables. Remove
rust-cc-1.0, rust-pkg-config-0.3, rust-toml-0.5 from cargo-inputs.
[native-inputs]: Add libgit2, openssl, pkg-config, zlib.
This commit is contained in:
Efraim Flashner 2020-01-21 12:52:11 +02:00
parent 6dc67c2d11
commit c40e3d0bad
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gnu/packages/rust-apps.scm
View file

@ -22,7 +22,11 @@ (define-module (gnu packages rust-apps)
#:use-module (guix build-system cargo) #:use-module (guix build-system cargo)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages crates-io)) #:use-module (gnu packages compression)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control))
(define-public ripgrep (define-public ripgrep
(package (package
@ -125,11 +129,7 @@ (define-public tokei
("rust-serde-json" ,rust-serde-json-1.0) ("rust-serde-json" ,rust-serde-json-1.0)
("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-serde-yaml" ,rust-serde-yaml-0.8)
("rust-term-size" ,rust-term-size-0.3) ("rust-term-size" ,rust-term-size-0.3)
("rust-toml" ,rust-toml-0.5) ("rust-toml" ,rust-toml-0.5))
;; Transitive build dependencies:
("rust-cc" ,rust-cc-1.0)
("rust-pkg-config" ,rust-pkg-config-0.3)
("rust-vcpkg" ,rust-vcpkg-0.2))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-git2" ,rust-git2-0.11) (("rust-git2" ,rust-git2-0.11)
("rust-handlebars" ,rust-handlebars-2.0) ("rust-handlebars" ,rust-handlebars-2.0)
@ -137,7 +137,33 @@ (define-public tokei
("rust-lazy-static" ,rust-lazy-static-1.4) ("rust-lazy-static" ,rust-lazy-static-1.4)
("rust-regex" ,rust-regex-1.3) ("rust-regex" ,rust-regex-1.3)
("rust-serde-json" ,rust-serde-json-1.0) ("rust-serde-json" ,rust-serde-json-1.0)
("rust-tempfile" ,rust-tempfile-3.0)))) ("rust-tempfile" ,rust-tempfile-3.0))
#:phases
(modify-phases %standard-phases
(add-after 'configure 'unvendor-libraries-from-crates
(lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl")))
(setenv "OPENSSL_DIR" openssl)
(setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
(delete-file-recursively
(string-append "guix-vendor/rust-libgit2-sys-"
,(package-version rust-libgit2-sys-0.10)
".crate/libgit2"))
(delete-file-recursively
(string-append "guix-vendor/rust-libssh2-sys-"
,(package-version rust-libssh2-sys-0.2)
".crate/libssh2"))
(delete-file-recursively
(string-append "guix-vendor/rust-libz-sys-"
,(package-version rust-libz-sys-1.0)
".crate/src/zlib")))
#t)))))
(native-inputs
`(("libgit2" ,libgit2)
("openssl" ,openssl)
("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(home-page "https://tokei.rs") (home-page "https://tokei.rs")
(synopsis "Count code, quickly") (synopsis "Count code, quickly")
(description (description