diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-07 18:20:23 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-07 18:20:23 +0200 |
| commit | 6cfb2e6270b2759fb98a0de665235bcbb9b9eccf (patch) | |
| tree | 83c467772a94cbf72f96b26b08f0a29d1822b1c1 /gnu/packages/patches/rust-openssl-sys-no-vendor.patch | |
| parent | 92fdda5a6351dd5246b65165547d50d0b827cef3 (diff) | |
| parent | 453e7dd8c4b9422a7c80e3b3e75589b6471f5af1 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/rust-openssl-sys-no-vendor.patch')
| -rw-r--r-- | gnu/packages/patches/rust-openssl-sys-no-vendor.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch index 9855faf8b21..3e300ea69e5 100644 --- a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch +++ b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch @@ -6,12 +6,12 @@ Starting from rust-openssl-sys@0.9.69 Cargo.toml starts searching for openssl-3. --- a/Cargo.toml +++ b/Cargo.toml -@@ -31,14 +31,11 @@ +@@ -31,15 +31,12 @@ [build-dependencies.cc] version = "1.0" -[build-dependencies.openssl-src] --version = "111.0.1" +-version = "111" -optional = true - [build-dependencies.pkg-config] @@ -20,6 +20,7 @@ Starting from rust-openssl-sys@0.9.69 Cargo.toml starts searching for openssl-3. [features] vendored = ["openssl-src"] +openssl-src = [] + [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] - version = "0.2" + version = "0.2.8" |