Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt
2021-05-08 14:43:43 +02:00
657 changed files with 2572 additions and 1628 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3
, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3
, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome
, gobject-introspection }:
python3.pkgs.buildPythonApplication rec {
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
buildInputs = [
gtk3 glib gnome3.adwaita-icon-theme python3
gtk3 glib gnome.adwaita-icon-theme python3
];
propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [
gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now