From 54d139174aa121e53595ea99580bc7724352cd95 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Tue, 15 Nov 2022 23:51:29 +0100 Subject: [PATCH] rustup-toolchain-install-master: fix build by using openssl 1.x Upstream package didn't have recent releases. Currently build fails with something like ``` running: "/nix/store/dq0xwmsk1g0i2ayg6pb7y87na2knzylh-gcc-wrapper-11.3.0/bin/cc" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-I" "/nix/store/f95kxwhnr2bazy7nl6wzwjiak02dlp9v-openssl-3.0.7-dev/include" "-Wall" "-Wextra" "-E" "build/expando.c" cargo:warning=build/expando.c:4:24: error: pasting "RUST_VERSION_OPENSSL_" and "(" does not give a valid preprocessing token cargo:warning= 4 | #define VERSION2(n, v) RUST_VERSION_##n##_##v cargo:warning= | ^~~~~~~~~~~~~ cargo:warning=build/expando.c:5:23: note: in expansion of macro 'VERSION2' cargo:warning= 5 | #define VERSION(n, v) VERSION2(n, v) cargo:warning= | ^~~~~~~~ cargo:warning=build/expando.c:10:1: note: in expansion of macro 'VERSION' cargo:warning= 10 | VERSION(OPENSSL, OPENSSL_VERSION_NUMBER) cargo:warning= | ^~~~~~~ exit status: 1 ``` which looks like https://github.com/sfackler/rust-openssl/issues/1030 and should be fixed in a transitive dependency by https://github.com/sfackler/rust-openssl/pull/1264 But rather than trying to bump transitive dependency let's downgrade openssl used by this package. ZHF: #199919 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f3d7a3dde6d..7affdba11ca1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15246,6 +15246,7 @@ with pkgs; }; rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { inherit (darwin.apple_sdk.frameworks) Security; + openssl = openssl_1_1; }; rusty-man = callPackage ../development/tools/rust/rusty-man { };