diff options
| author | ajs124 <git@ajs124.de> | 2022-07-04 16:10:09 +0200 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2022-08-17 20:16:23 +0200 |
| commit | 659ea66a8ece39d414e02f66819619edf52aad35 (patch) | |
| tree | 0deffc917d1c22a607661f0bc551312dd2362166 | |
| parent | b9c0db8d86d7a2d278fb5d439c3a2504ff010073 (diff) | |
| download | nixpkgs-659ea66a8ece39d414e02f66819619edf52aad35.tar nixpkgs-659ea66a8ece39d414e02f66819619edf52aad35.tar.gz nixpkgs-659ea66a8ece39d414e02f66819619edf52aad35.tar.bz2 nixpkgs-659ea66a8ece39d414e02f66819619edf52aad35.tar.lz nixpkgs-659ea66a8ece39d414e02f66819619edf52aad35.tar.xz nixpkgs-659ea66a8ece39d414e02f66819619edf52aad35.tar.zst nixpkgs-659ea66a8ece39d414e02f66819619edf52aad35.zip | |
rustup: pin to openssl_1_1
| -rw-r--r-- | pkgs/development/tools/rust/rustup/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 1 deletions
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 { |