Merge branch 'staging-next' into staging

2020-10-25 09:47:04 +01:00
parent 8d6bd565a1 4bd836b381
commit 2f6b00b15e
418 changed files with 7056 additions and 3808 deletions
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
  mesonFlags = [
    # Avoid the need for gobject introspection binaries in PATH in cross-compiling case.
    # Instead we just copy them over from the native output.
-    "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}"
+    "-Dgtk_doc=${boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}"
    "-Dnls=enabled"
    "-Ddevbindir=${placeholder ''dev''}/bin"
  ];