diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-03-25 00:59:14 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-03-28 22:10:05 +0200 |
| commit | 01d8d1b062495b47c80a765a90176b70dc09a347 (patch) | |
| tree | bbb3c91fc91bde454c9175436e892dce657cf5de | |
| parent | af33b23de3144b2c2085dda19dc223369683a495 (diff) | |
| download | nixlib-01d8d1b062495b47c80a765a90176b70dc09a347.tar nixlib-01d8d1b062495b47c80a765a90176b70dc09a347.tar.gz nixlib-01d8d1b062495b47c80a765a90176b70dc09a347.tar.bz2 nixlib-01d8d1b062495b47c80a765a90176b70dc09a347.tar.lz nixlib-01d8d1b062495b47c80a765a90176b70dc09a347.tar.xz nixlib-01d8d1b062495b47c80a765a90176b70dc09a347.tar.zst nixlib-01d8d1b062495b47c80a765a90176b70dc09a347.zip | |
rustc: use llvm_39
| -rw-r--r-- | pkgs/development/compilers/rust/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 91d7cda1c00a..afab703ae5b5 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,5 +1,8 @@ -{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, - targets ? [], targetToolchains ? [], targetPatches ? [] }: +{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm +, targets ? [] +, targetToolchains ? [] +, targetPatches ? [] +}: let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); @@ -17,6 +20,7 @@ rec { ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + inherit llvm; inherit targets; inherit targetPatches; inherit targetToolchains; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20cc897ae19c..601c1d411308 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5541,7 +5541,9 @@ with pkgs; }; 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 {})); rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix { rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); |