Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3b68ae53d937
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f66311ae1246
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 13, 2020

  1. pasystray: ayatana appindicators instead of libappindicator

    @NickHu
    NickHu committed Oct 13, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    NickHu Nick Hu
    GPG key ID: 9E35DDA3DF631330
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8d8cd89 View commit details

Commits on Nov 27, 2020

  1. Merge pull request #100414 from NickHu/pasystray 

    pasystray: ayatana appindicators instead of libappindicator
    @SuperSandro2000
    SuperSandro2000 authored Nov 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f66311a View commit details
Showing with 9 additions and 3 deletions.
  1. +9 −3 pkgs/tools/audio/pasystray/default.nix
12 changes: 9 additions & 3 deletions pkgs/tools/audio/pasystray/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
];