Merge pull request #100414 from NickHu/pasystray

pasystray: ayatana appindicators instead of libappindicator
This commit is contained in:
Sandro 2020-11-27 20:51:07 +01:00 committed by GitHub
commit f66311ae12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio
{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio
, xlibsWrapper, gsettings-desktop-schemas
}:
@ -17,12 +17,18 @@ stdenv.mkDerivation rec {
patches = [
# https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701
./fix-wayland.patch
# https://github.com/christophgysin/pasystray/issues/98
(fetchpatch {
url = "https://sources.debian.org/data/main/p/pasystray/0.7.1-1/debian/patches/0001-Build-against-ayatana-appindicator.patch";
sha256 = "0hijphrf52n2zfwdnrmxlp3a7iwznnkb79awvpzplz0ia2lqywpw";
})
];
nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
buildInputs = [
gnome3.adwaita-icon-theme
avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper
avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper
gsettings-desktop-schemas
];