Merge master into staging-next

2020-06-12 08:57:26 +02:00
parent df412d462f dbdc5af9e8
commit febc27b59a
146 changed files with 1775 additions and 851 deletions
@@ -66,6 +66,7 @@ in stdenv.mkDerivation rec {
    "USE_SYSTEM_ZLIB=1"
    "NSS_USE_SYSTEM_SQLITE=1"
    "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc"
+  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
    # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with
    # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64
    "OS_TEST=${cpu}"