MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24418 from LnL7/darwin-rust

Browse source 
rustc: use llvm_39
This commit is contained in:
Daniel Peebles 2017-03-28 20:34:07 -04:00 committed by GitHub
commit 903fc1d6c9
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,8 @@
{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, { stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm
targets ? [], targetToolchains ? [], targetPatches ? [] }: , targets ? []
, targetToolchains ? []
, targetPatches ? []
}:
let let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
@ -17,6 +20,7 @@ rec {
./patches/darwin-disable-fragile-tcp-tests.patch ./patches/darwin-disable-fragile-tcp-tests.patch
] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
inherit llvm;
inherit targets; inherit targets;
inherit targetPatches; inherit targetPatches;
inherit targetToolchains; inherit targetToolchains;

4
pkgs/top-level/all-packages.nix
View file

@ -5542,7 +5542,9 @@ with pkgs;
}; };
rust = rustStable; rust = rustStable;
rustStable = callPackage ../development/compilers/rust {}; rustStable = callPackage ../development/compilers/rust {
inherit (llvmPackages_39) llvm;
};
rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {})); rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {}));
rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix { rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix {
rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);