diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-12-02 21:25:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-12-23 18:27:56 +0000 |
| commit | b9d274b89d389a35325069bcc6a78d7c482c80fc (patch) | |
| tree | bc10367d8a27a51c7819809b2390fd155fb38edf | |
| parent | fdfbb4671ebbe47771261417ee69ad2957003d2e (diff) | |
| download | nixpkgs-b9d274b89d389a35325069bcc6a78d7c482c80fc.tar nixpkgs-b9d274b89d389a35325069bcc6a78d7c482c80fc.tar.gz nixpkgs-b9d274b89d389a35325069bcc6a78d7c482c80fc.tar.bz2 nixpkgs-b9d274b89d389a35325069bcc6a78d7c482c80fc.tar.lz nixpkgs-b9d274b89d389a35325069bcc6a78d7c482c80fc.tar.xz nixpkgs-b9d274b89d389a35325069bcc6a78d7c482c80fc.tar.zst nixpkgs-b9d274b89d389a35325069bcc6a78d7c482c80fc.zip | |
rustPlatform.fetchcargo: expose
| -rw-r--r-- | pkgs/build-support/rust/fetchcargo.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/default.nix | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 01e410c8bf8..7a0ba38dce7 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -18,9 +18,9 @@ let cargo-vendor-normalise = stdenv.mkDerivation { }; in { name ? "cargo-deps" -, src -, srcs -, patches +, src ? null +, srcs ? [] +, patches ? [] , sourceRoot , sha256 , cargoUpdateHook ? "" diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 75104ac7ad5..60e31c6def4 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -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 { |