mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-20 02:55:39 +00:00
rustc: 1.80.0 -> 1.80.1, add zlib dependency on Darwin
This commit is contained in:
parent
3f01b50c68
commit
27d4ae6645
@ -46,8 +46,8 @@ let
|
||||
in
|
||||
import ./default.nix
|
||||
{
|
||||
rustcVersion = "1.80.0";
|
||||
rustcSha256 = "sha256-b2BsGT8jD2ssrkV297JNUPX5sl3/Edv5si94fTUh1nI=";
|
||||
rustcVersion = "1.80.1";
|
||||
rustcSha256 = "sha256-LAuPZDlC3LgQy8xQ8pJWSxtuRNtdX0UJEVOZbfldLcQ=";
|
||||
|
||||
llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
|
||||
llvmSharedForHost = llvmSharedFor pkgsBuildHost;
|
||||
|
@ -2,7 +2,7 @@
|
||||
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
|
||||
, runCommandLocal, fetchurl, file, python3
|
||||
, darwin, cargo, cmake, rustc, rustfmt
|
||||
, pkg-config, openssl, xz
|
||||
, pkg-config, openssl, xz, zlib
|
||||
, libiconv
|
||||
, which, libffi
|
||||
, withBundledLLVM ? false
|
||||
@ -255,7 +255,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
++ optionals fastCross [ lndir makeWrapper ];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ optionals stdenv.isDarwin [ libiconv Security ]
|
||||
++ optionals stdenv.isDarwin [ libiconv Security zlib ]
|
||||
++ optional (!withBundledLLVM) llvmShared.lib
|
||||
++ optional (useLLVM && !withBundledLLVM) [
|
||||
llvmPackages.libunwind
|
||||
|
Loading…
Reference in New Issue
Block a user