Merge staging-next into master

2019-04-30 15:50:24 +02:00
parent d6b866e52b 2f936f85d8
commit fd2bd6e433
240 changed files with 2635 additions and 787 deletions
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
 , gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio
-, xlibsWrapper
+, xlibsWrapper, gsettings-desktop-schemas
 }:

 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    gnome3.adwaita-icon-theme
    avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper
-    gnome3.gsettings-desktop-schemas
+    gsettings-desktop-schemas
  ];

  meta = with stdenv.lib; {