Merge branch 'staging-next' into staging

2019-09-22 10:06:45 +02:00
parent 5505d2f036 76b7dd1ba9
commit 6c567ed797
61 changed files with 889 additions and 534 deletions
@@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
    qtx11extras
  ];

+  # Disable assertions which include -dev QtBase file paths.
+  NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
+
  configureFlags = [
    "--without-python"
  ] ++ (if enableDbus then [