diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-10-01 17:51:46 -0400 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:35 +0000 |
commit | 7181b4dddc65a171c747fee348a1c4f3fd05c2af (patch) | |
tree | 60da223413aef7f17b27c2330dac89ee6f710a23 /nixpkgs/pkgs/top-level/all-packages.nix | |
parent | ae014a220dac839789833e1825e0ca295e7e93c7 (diff) | |
download | nixlib-7181b4dddc65a171c747fee348a1c4f3fd05c2af.tar nixlib-7181b4dddc65a171c747fee348a1c4f3fd05c2af.tar.gz nixlib-7181b4dddc65a171c747fee348a1c4f3fd05c2af.tar.bz2 nixlib-7181b4dddc65a171c747fee348a1c4f3fd05c2af.tar.lz nixlib-7181b4dddc65a171c747fee348a1c4f3fd05c2af.tar.xz nixlib-7181b4dddc65a171c747fee348a1c4f3fd05c2af.tar.zst nixlib-7181b4dddc65a171c747fee348a1c4f3fd05c2af.zip |
makeRustPlatform: Put back in it's own file.
We expose it on the top level, but I don't think it makes sense to pull it from a specific version of the rust tools when it is in fact version agnostic. This reverts a tiny portion of 912dca193aee9da77a4d429285db53729d81aa3d. (cherry picked from commit 54b4b470c3a7149a7c459d92859a51c2e7a04cf7)
Diffstat (limited to 'nixpkgs/pkgs/top-level/all-packages.nix')
-rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 387916ab7756..f60db1f55289 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -9187,7 +9187,8 @@ in rustPackages = rustPackages_1_46; inherit (rustPackages) cargo clippy rustc rustPlatform; - inherit (rust) makeRustPlatform; + + makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; |