lol

libayatana-appindicator: 0.5.5 -> 0.5.91, convert to cmake, cleanup

Yureka ad5766dc 24561142

+15 -22
+13 -20
pkgs/development/libraries/libayatana-appindicator/default.nix
··· 1 1 { stdenv, fetchFromGitHub, lib 2 - , pkg-config, autoreconfHook , gtk-doc 2 + , pkg-config, cmake 3 + , gtk-doc 4 + , gtk3, libayatana-indicator, libdbusmenu-gtk3 5 + , vala 3 6 , gobject-introspection 4 - , gtkVersion ? "3" 5 - , gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2 6 - , gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3 7 - , dbus-glib, 8 7 }: 9 8 10 9 stdenv.mkDerivation rec { 11 - pname = "libayatana-appindicator-gtk${gtkVersion}"; 12 - version = "0.5.5"; 10 + pname = "libayatana-appindicator"; 11 + version = "0.5.91"; 13 12 14 13 outputs = [ "out" "dev" ]; 15 14 ··· 17 16 owner = "AyatanaIndicators"; 18 17 repo = "libayatana-appindicator"; 19 18 rev = version; 20 - sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk"; 19 + sha256 = "sha256-hOMnpBF0VaFLYvbiKp8n88F14wIeLqSCsT6GFR3ATys="; 21 20 }; 22 21 23 - nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ]; 22 + nativeBuildInputs = [ pkg-config cmake gtk-doc vala gobject-introspection ]; 24 23 25 - buildInputs = 26 - lib.optional (gtkVersion == "2") libayatana-indicator-gtk2 27 - ++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3; 28 - 29 - propagatedBuildInputs = 30 - lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ] 31 - ++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ]; 24 + buildInputs = [ gtk3 ]; 32 25 33 - preAutoreconf = '' 34 - gtkdocize 35 - ''; 26 + propagatedBuildInputs = [ libayatana-indicator libdbusmenu-gtk3 ]; 36 27 37 - configureFlags = [ "--with-gtk=${gtkVersion}" ]; 28 + cmakeFlags = [ 29 + "-DENABLE_BINDINGS_MONO=False" 30 + ]; 38 31 39 32 meta = with lib; { 40 33 description = "Ayatana Application Indicators Shared Library";
+2
pkgs/top-level/aliases.nix
··· 720 720 libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22 721 721 libayatana-indicator-gtk2 = "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 722 722 libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18 723 + libayatana-appindicator-gtk2 = "'libayatana-appindicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 724 + libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18 723 725 libbencodetools = bencodetools; # Added 2022-07-30 724 726 libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14 725 727 libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22
-2
pkgs/top-level/all-packages.nix
··· 19567 19567 libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; 19568 19568 libappindicator = callPackage ../development/libraries/libappindicator { }; 19569 19569 19570 - libayatana-appindicator-gtk2 = libayatana-appindicator.override { gtkVersion = "2"; }; 19571 - libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; 19572 19570 libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; 19573 19571 19574 19572 libargs = callPackage ../development/libraries/libargs { };