diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2017-06-15 22:12:31 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-06-25 11:56:29 +0100 |
| commit | 7a10cc84a0cd532c8a248d26dedf61d15615fb4d (patch) | |
| tree | d7f7f1514098b012c22439e1a92aab24e0713dff /pkgs/build-support | |
| parent | c610f99d8fc25dbdcd8530aca17a838c32ac569f (diff) | |
| download | nixlib-7a10cc84a0cd532c8a248d26dedf61d15615fb4d.tar nixlib-7a10cc84a0cd532c8a248d26dedf61d15615fb4d.tar.gz nixlib-7a10cc84a0cd532c8a248d26dedf61d15615fb4d.tar.bz2 nixlib-7a10cc84a0cd532c8a248d26dedf61d15615fb4d.tar.lz nixlib-7a10cc84a0cd532c8a248d26dedf61d15615fb4d.tar.xz nixlib-7a10cc84a0cd532c8a248d26dedf61d15615fb4d.tar.zst nixlib-7a10cc84a0cd532c8a248d26dedf61d15615fb4d.zip | |
rustRegistry: switch to mkDerivation
fixes #26582
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 6e2c44552252..36130289fbaa 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -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; |