tree-wide: libayatana-{app,}indicator-gtk3 -> libayatana-{app,}indicator

This commit is contained in:
Yureka 2022-10-18 14:13:06 +02:00
parent ad5766dca8
commit 6279ab9cba
6 changed files with 12 additions and 12 deletions

View File

@ -7,7 +7,7 @@
, gobject-introspection , gobject-introspection
, intltool, wrapGAppsHook, glib , intltool, wrapGAppsHook, glib
, librsvg , librsvg
, libayatana-appindicator-gtk3 , libayatana-appindicator
, libpulseaudio , libpulseaudio
, keybinder3 , keybinder3
, gdk-pixbuf , gdk-pixbuf
@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec {
gtk3 gtk3
gobject-introspection gobject-introspection
librsvg librsvg
libayatana-appindicator-gtk3 libayatana-appindicator
libpulseaudio libpulseaudio
keybinder3 keybinder3
]; ];

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck, libxklavier { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck, libxklavier
, appindicatorSupport ? true, libayatana-appindicator-gtk3 , appindicatorSupport ? true, libayatana-appindicator
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config autoreconfHook ]; 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"; configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes";
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];

View File

@ -16,7 +16,7 @@
, imagemagickSupport ? true , imagemagickSupport ? true
, imagemagick , imagemagick
, appindicatorSupport ? true , appindicatorSupport ? true
, libayatana-appindicator-gtk3 , libayatana-appindicator
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec {
libnotify libnotify
librsvg librsvg
] ]
++ lib.optional appindicatorSupport libayatana-appindicator-gtk3; ++ lib.optional appindicatorSupport libayatana-appindicator;
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
beautifulsoup4 beautifulsoup4

View File

@ -9,7 +9,7 @@
, gtkspell3 , gtkspell3
, ofono , ofono
, itstool , itstool
, libayatana-appindicator-gtk3 , libayatana-appindicator
, perlPackages , perlPackages
, meson , meson
, ninja , ninja
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
gdbm gdbm
gtkspell3 gtkspell3
ofono ofono
libayatana-appindicator-gtk3 libayatana-appindicator
]; ];
patches = [ patches = [

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, headsetcontrol, wrapGAppsHook, python3, gtk3 { lib, stdenv, fetchFromGitHub, headsetcontrol, wrapGAppsHook, python3, gtk3
, gobject-introspection, libayatana-appindicator-gtk3 }: , gobject-introspection, libayatana-appindicator }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# The last versioned release is 1.0.0.0 from 2020, since then there were updates but no versioned release. # 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 headsetcontrol
gtk3 gtk3
gobject-introspection gobject-introspection
libayatana-appindicator-gtk3 libayatana-appindicator
]; ];
installPhase = '' installPhase = ''

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook { 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 , xlibsWrapper, gsettings-desktop-schemas
}: }:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ];
buildInputs = [ buildInputs = [
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper avahi gtk3 libayatana-appindicator libnotify libpulseaudio xlibsWrapper
gsettings-desktop-schemas gsettings-desktop-schemas
]; ];