gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #333387 from K900/rustc-1.80.1

Browse Source 
[staging-next] rustc: 1.80.0 -> 1.80.1, add zlib dependency on Darwin
This commit is contained in:
K900
2024-08-09 10:52:33 +03:00
committed by GitHub
parent 3f01b50c68 27d4ae6645
commit 36982b9f85
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/rust/1_80.nix
+2 -2
View File
@@ -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;
pkgs/development/compilers/rust/rustc.nix
+2 -2
View File
@@ -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