public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2019-12-25 05:18:52 +01:00
parent 9a5e80ae29 ca39dd3a8a
commit 4bbc6cc66f
491 changed files with 22214 additions and 7240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/rust/default.nix
View File

@@ -19,17 +19,17 @@
}.${cpu.name} or cpu.name;
in "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";
makeRustPlatform = { rustc, cargo, ... }: {
makeRustPlatform = { rustc, cargo, ... }: rec {
rust = {
inherit rustc cargo;
};
buildRustPackage = callPackage ../../../build-support/rust {
inherit rustc cargo;
fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix {
inherit cargo;
};
fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix {
inherit cargo;
};
buildRustPackage = callPackage ../../../build-support/rust {
inherit rustc cargo fetchcargo;
};
rustcSrc = callPackage ./rust-src.nix {