Merge staging-next into staging

2020-06-08 12:08:51 +02:00
parent 5f47c36752 dc33419285
commit 8576d24b2a
127 changed files with 998 additions and 642 deletions
@@ -77,7 +77,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