Merge branch 'master' into staging-next

2019-10-12 00:50:21 +02:00
parent a0c34f54cc 8b57a7573c
commit 6c8aed6391
440 changed files with 19793 additions and 9783 deletions
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , meson
 , ninja
+, vala
 , pkgconfig
 , pantheon
 , python3
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    meson
    ninja
-    pantheon.vala
+    vala
    pkgconfig
    python3
    wrapGAppsHook