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 /pkgs/development/compilers/rust/default.nix | |
parent | af33b23de3144b2c2085dda19dc223369683a495 (diff) | |
download | nixpkgs-01d8d1b062495b47c80a765a90176b70dc09a347.tar nixpkgs-01d8d1b062495b47c80a765a90176b70dc09a347.tar.gz nixpkgs-01d8d1b062495b47c80a765a90176b70dc09a347.tar.bz2 nixpkgs-01d8d1b062495b47c80a765a90176b70dc09a347.tar.lz nixpkgs-01d8d1b062495b47c80a765a90176b70dc09a347.tar.xz nixpkgs-01d8d1b062495b47c80a765a90176b70dc09a347.tar.zst nixpkgs-01d8d1b062495b47c80a765a90176b70dc09a347.zip |
rustc: use llvm_39
Diffstat (limited to 'pkgs/development/compilers/rust/default.nix')
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 91d7cda1c00..afab703ae5b 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; |