libdeltachat: use fetchCargoVendor

Author: dotlambda

pkgs/by-name/de/deltachat-repl/package.nix

@@ -6,7 +6,7 @@
 rustPlatform.buildRustPackage {
   pname = "deltachat-repl";
 
-  inherit (libdeltachat) version src cargoLock buildInputs;
+  inherit (libdeltachat) version src cargoDeps buildInputs;
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/de/deltachat-rpc-server/package.nix

@@ -6,7 +6,7 @@
 rustPlatform.buildRustPackage {
   pname = "deltachat-rpc-server";
 
-  inherit (libdeltachat) version src cargoLock buildInputs;
+  inherit (libdeltachat) version src cargoDeps buildInputs;
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/li/libdeltachat/package.nix

@@ -18,16 +18,7 @@
 , libiconv
 }:
 
-let
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "email-0.0.20" = "sha256-rV4Uzqt2Qdrfi5Ti1r+Si1c2iW1kKyWLwOgLkQ5JGGw=";
-      "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
-      "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
-    };
-  };
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "libdeltachat";
   version = "1.148.7";
 
@@ -42,7 +33,11 @@ in stdenv.mkDerivation rec {
     ./no-static-lib.patch
   ];
 
-  cargoDeps = rustPlatform.importCargoLock cargoLock;
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    pname = "deltachat-core-rust";
+    inherit version src;
+    hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk=";
+  };
 
   nativeBuildInputs = [
     cmake
@@ -78,7 +73,6 @@ in stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    inherit cargoLock;
     tests = {
       inherit deltachat-desktop deltachat-repl deltachat-rpc-server;
       python = python3.pkgs.deltachat;