Merge branch 'staging-next'

It's not perfect, but I think we can deal with the rest of the
regressions directly on master, so that this process does not stall.
This commit is contained in:
Vladimír Čunát
2019-10-13 15:50:37 +02:00
220 changed files with 3185 additions and 2178 deletions

View File

@@ -1,6 +1,6 @@
{ stdenv, buildPythonApplication, fetchFromGitHub
, gtk3, wrapGAppsHook, gst_all_1, gobject-introspection
, python3Packages, gnome3, hicolor-icon-theme }:
, python3Packages, gnome3 }:
buildPythonApplication {
pname = "gscrabble";
@@ -19,7 +19,7 @@ buildPythonApplication {
buildInputs = with gst_all_1; [
gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
hicolor-icon-theme gnome3.adwaita-icon-theme gtk3 gobject-introspection
gnome3.adwaita-icon-theme gtk3 gobject-introspection
];
propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ];