Merge branch 'staging-next' into staging

2021-01-15 17:47:43 +01:00
parent 0286df914e c0d2951fa6
commit e03806bc45
1804 changed files with 7434 additions and 5627 deletions
@@ -153,6 +153,6 @@ stdenv.mkDerivation (rec {
 } // optionalAttrs stdenv.hostPlatform.isMusl {
  # Work around a bogus warning in conjunction with musl.
  NIX_CFLAGS_COMPILE = "-Wno-error";
-} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isAndroid {
+} // lib.optionalAttrs stdenv.hostPlatform.isAndroid {
  NIX_CFLAGS_COMPILE = "-D__USE_FORTIFY_LEVEL=0";
 })