Merge staging into staging-next

2019-09-29 11:05:22 +02:00
parent 9b09b832fc 52af1d0930
commit 503081fa5b
219 changed files with 3102 additions and 2180 deletions
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
  configureFlags = [
    "--without-python"
  ] ++ (if enableDbus then [
-    "--with-dbusconfdir=${placeholder "out"}/etc"
+    "--with-dbusconfdir=${placeholder "out"}/share"
  ] else [
    "--without-dbus"
  ]) ++ (if enableVideo then [