rustRegistry: switch to mkDerivation

fixes #26582
This commit is contained in:
Jörg Thalheim
2017-06-15 22:12:31 +01:00
parent c610f99d8f
commit 7a10cc84a0
3 changed files with 40 additions and 32 deletions

View File

@@ -1,5 +1,10 @@
{ stdenv, callPackage, path, cacert, git, rust }:
{ stdenv, callPackage, path, cacert, git, rust, rustRegistry }:
let
rustRegistry' = rustRegistry;
in
{ name, depsSha256
, rustRegistry ? rustRegistry'
, src ? null
, srcs ? null
, sourceRoot ? null
@@ -8,13 +13,10 @@
, cargoUpdateHook ? ""
, cargoDepsHook ? ""
, cargoBuildFlags ? []
, registry ? null
, ... } @ args:
let
lib = stdenv.lib;
rustRegistry = callPackage (path + /pkgs/top-level/rust-packages.nix)
(lib.optionalAttrs (registry != null) { src = registry; });
fetchDeps = import ./fetchcargo.nix {
inherit stdenv cacert git rust rustRegistry;