libayatana-appindicator: 0.5.5 -> 0.5.91, convert to cmake, cleanup
This commit is contained in:
parent
2456114244
commit
ad5766dca8
|
@ -1,15 +1,14 @@
|
||||||
{ stdenv, fetchFromGitHub, lib
|
{ stdenv, fetchFromGitHub, lib
|
||||||
, pkg-config, autoreconfHook , gtk-doc
|
, pkg-config, cmake
|
||||||
|
, gtk-doc
|
||||||
|
, gtk3, libayatana-indicator, libdbusmenu-gtk3
|
||||||
|
, vala
|
||||||
, gobject-introspection
|
, gobject-introspection
|
||||||
, gtkVersion ? "3"
|
|
||||||
, gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2
|
|
||||||
, gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3
|
|
||||||
, dbus-glib,
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libayatana-appindicator-gtk${gtkVersion}";
|
pname = "libayatana-appindicator";
|
||||||
version = "0.5.5";
|
version = "0.5.91";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
@ -17,24 +16,18 @@ stdenv.mkDerivation rec {
|
||||||
owner = "AyatanaIndicators";
|
owner = "AyatanaIndicators";
|
||||||
repo = "libayatana-appindicator";
|
repo = "libayatana-appindicator";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk";
|
sha256 = "sha256-hOMnpBF0VaFLYvbiKp8n88F14wIeLqSCsT6GFR3ATys=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];
|
nativeBuildInputs = [ pkg-config cmake gtk-doc vala gobject-introspection ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = [ gtk3 ];
|
||||||
lib.optional (gtkVersion == "2") libayatana-indicator-gtk2
|
|
||||||
++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3;
|
|
||||||
|
|
||||||
propagatedBuildInputs =
|
propagatedBuildInputs = [ libayatana-indicator libdbusmenu-gtk3 ];
|
||||||
lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
|
|
||||||
++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
|
|
||||||
|
|
||||||
preAutoreconf = ''
|
cmakeFlags = [
|
||||||
gtkdocize
|
"-DENABLE_BINDINGS_MONO=False"
|
||||||
'';
|
];
|
||||||
|
|
||||||
configureFlags = [ "--with-gtk=${gtkVersion}" ];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Ayatana Application Indicators Shared Library";
|
description = "Ayatana Application Indicators Shared Library";
|
||||||
|
|
|
@ -720,6 +720,8 @@ mapAliases ({
|
||||||
libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22
|
libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22
|
||||||
libayatana-indicator-gtk2 = "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18
|
libayatana-indicator-gtk2 = "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18
|
||||||
libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18
|
libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18
|
||||||
|
libayatana-appindicator-gtk2 = "'libayatana-appindicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18
|
||||||
|
libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18
|
||||||
libbencodetools = bencodetools; # Added 2022-07-30
|
libbencodetools = bencodetools; # Added 2022-07-30
|
||||||
libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14
|
libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14
|
||||||
libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22
|
libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22
|
||||||
|
|
|
@ -19567,8 +19567,6 @@ with pkgs;
|
||||||
libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
|
libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
|
||||||
libappindicator = callPackage ../development/libraries/libappindicator { };
|
libappindicator = callPackage ../development/libraries/libappindicator { };
|
||||||
|
|
||||||
libayatana-appindicator-gtk2 = libayatana-appindicator.override { gtkVersion = "2"; };
|
|
||||||
libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; };
|
|
||||||
libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { };
|
libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { };
|
||||||
|
|
||||||
libargs = callPackage ../development/libraries/libargs { };
|
libargs = callPackage ../development/libraries/libargs { };
|
||||||
|
|
Loading…
Reference in a new issue