summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-01-21 13:20:00 +0200
committerEfraim Flashner <efraim@flashner.co.il>2020-01-21 16:24:02 +0200
commit128aa31fe6255caf7bb7fabdca0ea4f695eaca41 (patch)
tree8ebced9ed7002d9986db3ecf218a14779afe9811
parentd7364e85e05a3faae0542d1b6470657863b11410 (diff)
downloadpatches-128aa31fe6255caf7bb7fabdca0ea4f695eaca41.tar
patches-128aa31fe6255caf7bb7fabdca0ea4f695eaca41.tar.gz
gnu: rust-openssl-sys-0.9: Don't hide package.
* gnu/packages/crates-io.scm (rust-openssl-sys-0.9)[arguments]: Add rust-libc-0.2, rust-autocfg-0.1, rust-cc-1.0, rust-pkg-config-0.3, rust-vcpkg-0.2 to cargo-inputs. Add custom phase to find packaged openssl. [native-inputs]: Add openssl, pkg-config. [properties]: Remove field.
-rw-r--r--gnu/packages/crates-io.scm32
1 files changed, 20 insertions, 12 deletions
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 5c6d760208..18b31bbb91 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -7035,22 +7035,30 @@ system for OpenSSL.")
(sha256
(base32 "0vvk8vzrc73y8n5rf4yj3x8ygyxjaz7wxrbxiwqi7qy0gyp1cpa6"))))
(build-system cargo-build-system)
- ;(arguments
- ; `(#:phases
- ; (modify-phases %standard-phases
- ; (add-after 'unpack 'find-openssl
- ; (lambda* (#:key inputs #:allow-other-keys)
- ; (let ((openssl (assoc-ref inputs "openssl")))
- ; (setenv "OPENSSL_DIR" openssl))
- ; #t)))))
- ;(inputs
- ; `(("openssl" ,openssl)
- ; ("pkg-config" ,pkg-config)))
+ (arguments
+ `(#:skip-build? #t ; it wants rust-openssl-src
+ #:cargo-inputs
+ (("rust-libc" ,rust-libc-0.2)
+ ;; Build dependencies:
+ ("rust-autocfg" ,rust-autocfg-0.1)
+ ("rust-cc" ,rust-cc-1.0)
+ ("rust-pkg-config" ,rust-pkg-config-0.3)
+ ;("rust-openssl-src" ,rust-openssl-src-111)
+ ("rust-vcpkg" ,rust-vcpkg-0.2))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'find-openssl
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((openssl (assoc-ref inputs "openssl")))
+ (setenv "OPENSSL_DIR" openssl))
+ #t)))))
+ (native-inputs
+ `(("openssl" ,openssl)
+ ("pkg-config" ,pkg-config)))
(home-page "https://github.com/sfackler/rust-openssl")
(synopsis "FFI bindings to OpenSSL")
(description
"This package provides FFI bindings to OpenSSL for use in rust crates.")
- (properties '((hidden? . #t)))
(license license:expat)))
(define-public rust-ordermap-0.3