diff options
author | Yureka <yuka@yuka.dev> | 2022-10-18 14:13:06 +0200 |
---|---|---|
committer | Yureka <yuka@yuka.dev> | 2022-10-19 00:22:29 +0200 |
commit | 6279ab9cba26c47d2a9578906f91277470b3c093 (patch) | |
tree | ef5298ba68aa096013e2fac9cf13075d9d013ab4 | |
parent | ad5766dca82a324b63fbc38c065ac94bd0829a35 (diff) |
tree-wide: libayatana-{app,}indicator-gtk3 -> libayatana-{app,}indicator
6 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/applications/audio/indicator-sound-switcher/default.nix index f5fe5914baee2..6610e53e2cc74 100644 --- a/pkgs/applications/audio/indicator-sound-switcher/default.nix +++ b/pkgs/applications/audio/indicator-sound-switcher/default.nix @@ -7,7 +7,7 @@ , gobject-introspection , intltool, wrapGAppsHook, glib , librsvg -, libayatana-appindicator-gtk3 +, libayatana-appindicator , libpulseaudio , keybinder3 , gdk-pixbuf @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { gtk3 gobject-introspection librsvg - libayatana-appindicator-gtk3 + libayatana-appindicator libpulseaudio keybinder3 ]; diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/applications/misc/gxkb/default.nix index e496d7864571a..350e331447605 100644 --- a/pkgs/applications/misc/gxkb/default.nix +++ b/pkgs/applications/misc/gxkb/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck, libxklavier -, appindicatorSupport ? true, libayatana-appindicator-gtk3 +, appindicatorSupport ? true, libayatana-appindicator }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ gtk3 libwnck libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3; + buildInputs = [ gtk3 libwnck libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator; configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes"; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 83c3fb69d19ce..a3af42c0fb847 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -16,7 +16,7 @@ , imagemagickSupport ? true , imagemagick , appindicatorSupport ? true -, libayatana-appindicator-gtk3 +, libayatana-appindicator }: python3.pkgs.buildPythonApplication rec { @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { libnotify librsvg ] - ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3; + ++ lib.optional appindicatorSupport libayatana-appindicator; propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 841c733a2f1dd..5702ff414f336 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -9,7 +9,7 @@ , gtkspell3 , ofono , itstool -, libayatana-appindicator-gtk3 +, libayatana-appindicator , perlPackages , meson , ninja @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gdbm gtkspell3 ofono - libayatana-appindicator-gtk3 + libayatana-appindicator ]; patches = [ diff --git a/pkgs/tools/audio/headset-charge-indicator/default.nix b/pkgs/tools/audio/headset-charge-indicator/default.nix index 2e4f631851900..f771fd47a7584 100644 --- a/pkgs/tools/audio/headset-charge-indicator/default.nix +++ b/pkgs/tools/audio/headset-charge-indicator/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, headsetcontrol, wrapGAppsHook, python3, gtk3 -, gobject-introspection, libayatana-appindicator-gtk3 }: +, gobject-introspection, libayatana-appindicator }: stdenv.mkDerivation rec { # The last versioned release is 1.0.0.0 from 2020, since then there were updates but no versioned release. @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { headsetcontrol gtk3 gobject-introspection - libayatana-appindicator-gtk3 + libayatana-appindicator ]; installPhase = '' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 2bedd2abacddd..be9dbca4baa9c 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook -, gnome, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio +, gnome, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio , xlibsWrapper, gsettings-desktop-schemas }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome.adwaita-icon-theme - avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper + avahi gtk3 libayatana-appindicator libnotify libpulseaudio xlibsWrapper gsettings-desktop-schemas ]; |