From 24561142442800d633f251ccb568f7f7e00d182e Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 18 Oct 2022 14:11:09 +0200 Subject: libayatana-indicator: 0.8.2 -> 0.9.2, convert to cmake, cleanup --- pkgs/top-level/aliases.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3be29c104b199..2d2f7ead47e76 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -718,6 +718,8 @@ mapAliases ({ letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22 libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # 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-gtk3 = libayatana-indicator; # Added 2022-10-18 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 libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22 -- cgit 1.4.1 From ad5766dca82a324b63fbc38c065ac94bd0829a35 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 18 Oct 2022 23:44:19 +0200 Subject: libayatana-appindicator: 0.5.5 -> 0.5.91, convert to cmake, cleanup --- .../libraries/libayatana-appindicator/default.nix | 33 +++++++++------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 15 insertions(+), 22 deletions(-) (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix index df1c6683fbcf5..a0d6d8db3a7cf 100644 --- a/pkgs/development/libraries/libayatana-appindicator/default.nix +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, lib -, pkg-config, autoreconfHook , gtk-doc +, pkg-config, cmake +, gtk-doc +, gtk3, libayatana-indicator, libdbusmenu-gtk3 +, vala , gobject-introspection -, gtkVersion ? "3" -, gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2 -, gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3 -, dbus-glib, }: stdenv.mkDerivation rec { - pname = "libayatana-appindicator-gtk${gtkVersion}"; - version = "0.5.5"; + pname = "libayatana-appindicator"; + version = "0.5.91"; outputs = [ "out" "dev" ]; @@ -17,24 +16,18 @@ stdenv.mkDerivation rec { owner = "AyatanaIndicators"; repo = "libayatana-appindicator"; 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 = - lib.optional (gtkVersion == "2") libayatana-indicator-gtk2 - ++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3; + buildInputs = [ gtk3 ]; - propagatedBuildInputs = - lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ] - ++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ]; + propagatedBuildInputs = [ libayatana-indicator libdbusmenu-gtk3 ]; - preAutoreconf = '' - gtkdocize - ''; - - configureFlags = [ "--with-gtk=${gtkVersion}" ]; + cmakeFlags = [ + "-DENABLE_BINDINGS_MONO=False" + ]; meta = with lib; { description = "Ayatana Application Indicators Shared Library"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2d2f7ead47e76..a31d1d95ad19d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -720,6 +720,8 @@ mapAliases ({ 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-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 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d1c0ea2e12eb..93a2f585a046e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19567,8 +19567,6 @@ with pkgs; libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; 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 { }; libargs = callPackage ../development/libraries/libargs { }; -- cgit 1.4.1