b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #242749 from reckenrode/rustc-darwin-cleanup

Browse source 
rustc: remove Darwin special-casing
This commit is contained in:
Sandro 2023-07-11 21:32:30 +02:00 committed by GitHub
parent e4fb0591c3 5df1c24a27
commit 9a705f9834
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/compilers/rust/1_70.nix
View file

@ -15,7 +15,6 @@
, CoreFoundation, Security, SystemConfiguration , CoreFoundation, Security, SystemConfiguration
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
, makeRustPlatform , makeRustPlatform
, llvmPackages_11
, llvmPackages_16, llvm_16 , llvmPackages_16, llvm_16
} @ args: } @ args:
@ -27,8 +26,6 @@ import ./default.nix {
llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForTarget = pkgsBuildTarget.llvmPackages_16.libllvm.override { enableSharedLibraries = true; };
llvmBootstrapForDarwin = llvmPackages_11;
# For use at runtime # For use at runtime
llvmShared = llvm_16.override { enableSharedLibraries = true; }; llvmShared = llvm_16.override { enableSharedLibraries = true; };
@ -60,4 +57,4 @@ import ./default.nix {
rustcPatches = [ ]; rustcPatches = [ ];
} }
(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_16" "llvm_16"]) (builtins.removeAttrs args [ "pkgsBuildTarget" "pkgsBuildBuild" "pkgsBuildHost" "llvmPackages_16" "llvm_16"])

7
pkgs/development/compilers/rust/default.nix
View file

@ -5,7 +5,6 @@
, bootstrapHashes , bootstrapHashes
, selectRustPackage , selectRustPackage
, rustcPatches ? [] , rustcPatches ? []
, llvmBootstrapForDarwin
, llvmShared , llvmShared
, llvmSharedForBuild , llvmSharedForBuild
, llvmSharedForHost , llvmSharedForHost
@ -16,7 +15,6 @@
, buildPackages , buildPackages
, newScope, callPackage , newScope, callPackage
, CoreFoundation, Security, SystemConfiguration , CoreFoundation, Security, SystemConfiguration
, pkgsBuildTarget, pkgsBuildBuild
, makeRustPlatform , makeRustPlatform
}: }:
@ -69,11 +67,6 @@ in
# Use boot package set to break cycle # Use boot package set to break cycle
inherit (bootstrapRustPackages) cargo rustc; inherit (bootstrapRustPackages) cargo rustc;
} // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
stdenv = llvmBootstrapForDarwin.stdenv;
pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; };
}); });
rustfmt = self.callPackage ./rustfmt.nix { rustfmt = self.callPackage ./rustfmt.nix {
inherit Security; inherit Security;