alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

libappindicator: 12.10.0 -> 12.10.1+20.10.20200706.1

Browse source 
This moves libappindicator to use a different upstream source. Rather
than use the 8 year old (!) version displayed on its homepage
(https://launchpad.net/libappindicator), this switches us to the
maintained lp:libappindicator branch, browseable over here:
https://code.launchpad.net/~indicator-applet-developers/libappindicator/trunk.

This includes numerous fixes, remains updated, and matches what ubuntu
uses.

Due to a personal preference for git over bzr, I have the package using
ubuntu's git mirror of the package for the source rather than the bzr
repo where I _think_ development actually takes place.

This also removes the no-python patch, because per revision 292
(https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk/revision/292),
that has been dropped from upstream already, so the patch is no longer
needed.

The primary motivation behind this change is to fix a crash with
libappindicator (reported
https://bugs.launchpad.net/ubuntu/+source/libappindicator/+bug/1867996
and in various other places).

The relevant patch for that should be included in this version.
This commit is contained in:
Euan Kemp 2020-07-18 17:11:24 -07:00 committed by Jon
parent 49dba2c4ad
commit 98e0716512
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/development/libraries/libappindicator/default.nix
View file

@ -1,11 +1,11 @@
# TODO: Resolve the issues with the Mono bindings. # TODO: Resolve the issues with the Mono bindings.
{ stdenv, fetchurl, fetchpatch, lib { stdenv, fetchgit, lib
, pkgconfig, autoreconfHook , pkgconfig, autoreconfHook
, glib, dbus-glib, gtkVersion ? "3" , glib, dbus-glib, gtkVersion ? "3"
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
, vala, gobject-introspection , gtk-doc, vala, gobject-introspection
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
}: }:
@ -15,18 +15,17 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
in "libappindicator-${postfix}-${version}"; in "libappindicator-${postfix}-${version}";
version = "${versionMajor}.${versionMinor}"; version = "12.10.1+20.10.20200706.1";
versionMajor = "12.10";
versionMinor = "0";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchgit {
url = "${meta.homepage}/${versionMajor}/${version}/+download/libappindicator-${version}.tar.gz"; url = "https://git.launchpad.net/ubuntu/+source/libappindicator";
sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"; rev = "fe25e53bc7e39cd59ad6b3270cd7a6a9c78c4f44";
sha256 = "0xjvbl4gn7ra2fs6gn2g9s787kzb5cg9hv79iqsz949rxh4iw32d";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection ]; nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection gtk-doc ];
propagatedBuildInputs = propagatedBuildInputs =
if gtkVersion == "2" if gtkVersion == "2"
@ -39,14 +38,9 @@ stdenv.mkDerivation rec {
then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
else [ libindicator-gtk3 ]); else [ libindicator-gtk3 ]);
patches = [ preAutoreconf = ''
# Remove python2 from libappindicator. gtkdocize
(fetchpatch { '';
name = "no-python.patch";
url = "https://src.fedoraproject.org/rpms/libappindicator/raw/8508f7a52437679fd95a79b4630373f08315f189/f/nopython.patch";
sha256 = "18b1xzvwsbhhfpbzf5zragij4g79pa04y1dk6v5ci1wsjvii725s";
})
];
configureFlags = [ configureFlags = [
"CFLAGS=-Wno-error" "CFLAGS=-Wno-error"