use less naersk

Author: link2xt

flake.nix

@@ -96,7 +96,7 @@
         };
 
         mkCrossRustPackage = pkgs.callPackage ./nix/cross-rust-package.nix {
-          inherit nixpkgs arch2targets naersk fenixPkgs system rustSrc version;
+          inherit nixpkgs arch2targets fenixPkgs system rustSrc version cargoLock;
         };
 
         mkAndroidRustPackage = pkgs.callPackage ./nix/android-package.nix {

nix/cross-rust-package.nix

@@ -1,4 +1,4 @@
-{ pkgs, nixpkgs, arch2targets, naersk, fenixPkgs, system, rustSrc, version }:
+{ pkgs, nixpkgs, arch2targets, fenixPkgs, system, rustSrc, version, cargoLock }:
 arch: packageName:
 let
   crossTarget = arch2targets."${arch}";
@@ -16,35 +16,20 @@ let
     fenixPkgs.stable.cargo
     fenixPkgs.targets.${rustTarget}.stable.rust-std
   ];
-  naersk-lib = (pkgs.callPackage naersk {
+  rustPlatform = pkgs.makeRustPlatform {
     cargo = toolchain;
     rustc = toolchain;
-  }).override {
-    pkgs = pkgsCross;
   };
 in
-naersk-lib.buildPackage rec {
+rustPlatform.buildRustPackage {
   pname = packageName;
-  cargoBuildOptions = x: x ++ [ "--package" packageName ];
   inherit version;
-  strictDeps = true;
   src = rustSrc;
+  cargoDeps = rustPlatform.importCargoLock cargoLock;
+  cargoBuildFlags = [ "--package" packageName ];
   nativeBuildInputs = [
     pkgsCross.buildPackages.perl # Needed to build vendored OpenSSL.
   ];
   auditable = false; # Avoid cargo-auditable failures.
   doCheck = false; # Disable test as it requires network access.
-
-  CARGO_TARGET_X86_64_APPLE_DARWIN_RUSTFLAGS = "-Clink-args=-L${pkgsCross.libiconv}/lib";
-  CARGO_TARGET_AARCH64_APPLE_DARWIN_RUSTFLAGS = "-Clink-args=-L${pkgsCross.libiconv}/lib";
-
-  CARGO_BUILD_TARGET = rustTarget;
-  TARGET_CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
-  CARGO_BUILD_RUSTFLAGS = [
-    "-C"
-    "linker=${TARGET_CC}"
-  ];
-
-  CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
-  LD = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
 }