rustPlatform: fix cross-compiling by using native diff

4 years ago · 0a8fb89fca
parent 92c3267ad4
commit 0a8fb89fca
1 changed files with 2 additions and 1 deletions
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@ -70,7 +70,8 @@ let

  # Specify the stdenv's `diff` by abspath to ensure that the user's build
  # inputs do not cause us to find the wrong `diff`.
-  diff = "${diffutils}/bin/diff";
+  # The `.nativeDrv` stanza works like nativeBuildInputs and ensures cross-compiling has the right version available.
+  diff = "${diffutils.nativeDrv or diffutils}/bin/diff";

 in