nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases 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
{ name ? "cargo-deps"
, src
, srcs
, patches
, src ? null
, srcs ? []
, patches ? []
, sourceRoot
, sha256
, cargoUpdateHook ? ""

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 {