diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-03 15:45:44 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-03 15:45:44 +0100 |
| commit | 52665d2b6bd709ba46c1e364a6d6164f5f4824ff (patch) | |
| tree | 55fd79b3939c08f6f6e9fe383f0df5e4caa82b57 /gnu/packages/rust-apps.scm | |
| parent | 584d08c5c98cb1893e4f44bd1c4191f405b13f01 (diff) | |
| parent | 0a83339bb1429332ee889e9a976aa214ae2ac0db (diff) | |
| download | patches-52665d2b6bd709ba46c1e364a6d6164f5f4824ff.tar patches-52665d2b6bd709ba46c1e364a6d6164f5f4824ff.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/rust-apps.scm')
| -rw-r--r-- | gnu/packages/rust-apps.scm | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 8ad3c0ced4..90bd146442 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -143,21 +143,7 @@ gitignore rules.") (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"))) + (setenv "OPENSSL_DIR" openssl)) #t))))) (native-inputs `(("libgit2" ,libgit2) |