BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rustPlatform.fetchcargo: expose

Browse source
This commit is contained in:
Alyssa Ross 2019-12-02 21:25:03 +00:00
parent fdfbb4671e
commit b9d274b89d
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/build-support/rust/fetchcargo.nix
View file

@ -18,9 +18,9 @@ let cargo-vendor-normalise = stdenv.mkDerivation {
}; };
in in
{ name ? "cargo-deps" { name ? "cargo-deps"
, src , src ? null
, srcs , srcs ? []
, patches , patches ? []
, sourceRoot , sourceRoot
, sha256 , sha256
, cargoUpdateHook ? "" , cargoUpdateHook ? ""

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

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