Merge branch 'staging-next' into staging

This commit is contained in:
Vladimír Čunát
2019-09-05 10:23:46 +02:00
220 changed files with 7360 additions and 2088 deletions

View File

@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgtk_doc=false"
"-Dinstalled_test_bindir=${placeholder ''installedTests''}/libexec"
"-Dinstalled_test_datadir=${placeholder ''installedTests''}/share"
"-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
"-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
"-Dinstalled_tests=true"
];