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 6cac7bed908c..93c6b2b82914 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5542,7 +5542,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);