From 659ea66a8ece39d414e02f66819619edf52aad35 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 16:10:09 +0200 Subject: rustup: pin to openssl_1_1 --- pkgs/development/tools/rust/rustup/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 65bad79aa8c..12e69bae20b 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -6,6 +6,7 @@ , rustPlatform , makeWrapper , pkg-config +, openssl , curl , zlib , Security @@ -36,7 +37,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ - curl + (curl.override { inherit openssl; }) zlib ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be853bd4a76..42a63a4b412 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14438,6 +14438,7 @@ with pkgs; }; rust-script = callPackage ../development/tools/rust/rust-script { }; rustup = callPackage ../development/tools/rust/rustup { + openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { -- cgit 1.4.1