mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-15 06:37:56 +00:00
libayatana-indicator: 0.8.2 -> 0.9.2, convert to cmake, cleanup
This commit is contained in:
parent
07ba16496b
commit
2456114244
@ -1,29 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub, lib
|
||||
, pkg-config, autoreconfHook
|
||||
, gtkVersion ? "3"
|
||||
, gtk2
|
||||
, pkg-config, cmake
|
||||
, gtk3
|
||||
, ayatana-ido
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libayatana-indicator-gtk${gtkVersion}";
|
||||
version = "0.8.2";
|
||||
pname = "libayatana-indicator";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AyatanaIndicators";
|
||||
repo = "libayatana-indicator";
|
||||
rev = version;
|
||||
sha256 = "1wlqm3pj12vgz587a72widbg0vcmm1klsd2lh3mpzfy20m3vjxhj";
|
||||
sha256 = "sha256-Bi+whbODdJMSQ6iiIrHAwht1Efi83icerT7ubQvE5n0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
buildInputs = [ ayatana-ido ]
|
||||
++ lib.optionals (gtkVersion == "2") [ gtk2 ]
|
||||
++ lib.optionals (gtkVersion == "3") [ gtk3 ];
|
||||
buildInputs = [ gtk3 ];
|
||||
|
||||
configureFlags = [ "--with-gtk=${gtkVersion}" ];
|
||||
propagatedBuildInputs = [ ayatana-ido ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ayatana Indicators Shared Library";
|
||||
|
@ -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
|
||||
|
@ -20094,8 +20094,6 @@ with pkgs;
|
||||
libindicator-gtk3 = libindicator.override { gtkVersion = "3"; };
|
||||
libindicator = callPackage ../development/libraries/libindicator { };
|
||||
|
||||
libayatana-indicator-gtk2 = libayatana-indicator.override { gtkVersion = "2"; };
|
||||
libayatana-indicator-gtk3 = libayatana-indicator.override { gtkVersion = "3"; };
|
||||
libayatana-indicator = callPackage ../development/libraries/libayatana-indicator { };
|
||||
|
||||
libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { };
|
||||
|
Loading…
Reference in New Issue
Block a user