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
@@ -1,6 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , desktop-file-utils
+, vala
 , gettext
 , glib
 , gtk3
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
    gettext
    meson
    ninja
-    pantheon.vala
+    vala
    pkgconfig
    python3
    wrapGAppsHook