ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-19 11:41:43 +03:00
Code Issues Projects Releases Wiki Activity

rustup: pin to openssl_1_1

Browse Source
This commit is contained in:
ajs124 2022-07-04 16:10:09 +02:00
parent b9c0db8d86
commit 659ea66a8e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/tools/rust/rustup/default.nix
View File

@ -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 ];

1
pkgs/top-level/all-packages.nix
View File

@ -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 {