Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-01-24 20:41:42 +01:00
631 changed files with 2683 additions and 2201 deletions

View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6";
};
patchPhase = ''patchShebangs .'';
patchPhase = "patchShebangs .";
preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
make CC=${buildPackages.stdenv.cc}/bin/cc find_sizes
mv find_sizes find_sizes_build