diff options
author | Euan Kemp <euank@euank.com> | 2020-07-18 17:11:24 -0700 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-08-25 14:50:48 -0700 |
commit | 98e07165124f8f84cc6b5de7d4c9f5c2367408bb (patch) | |
tree | 156a2883a278a4449ee1a180e39eadb19d009ba8 | |
parent | 49dba2c4ad8c8d2d7d94db94366093f83af913ba (diff) |
libappindicator: 12.10.0 -> 12.10.1+20.10.20200706.1
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.
-rw-r--r-- | pkgs/development/libraries/libappindicator/default.nix | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index dc0542c21267c..7a7ad22756c71 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -1,11 +1,11 @@ # TODO: Resolve the issues with the Mono bindings. -{ stdenv, fetchurl, fetchpatch, lib +{ stdenv, fetchgit, lib , pkgconfig, autoreconfHook , glib, dbus-glib, gtkVersion ? "3" , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? 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 }: @@ -15,18 +15,17 @@ with lib; stdenv.mkDerivation rec { name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; in "libappindicator-${postfix}-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "12.10"; - versionMinor = "0"; + version = "12.10.1+20.10.20200706.1"; outputs = [ "out" "dev" ]; - src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/libappindicator-${version}.tar.gz"; - sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"; + src = fetchgit { + url = "https://git.launchpad.net/ubuntu/+source/libappindicator"; + rev = "fe25e53bc7e39cd59ad6b3270cd7a6a9c78c4f44"; + sha256 = "0xjvbl4gn7ra2fs6gn2g9s787kzb5cg9hv79iqsz949rxh4iw32d"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection ]; + nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection gtk-doc ]; propagatedBuildInputs = if gtkVersion == "2" @@ -39,14 +38,9 @@ stdenv.mkDerivation rec { then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ libindicator-gtk3 ]); - patches = [ - # Remove python2 from libappindicator. - (fetchpatch { - name = "no-python.patch"; - url = "https://src.fedoraproject.org/rpms/libappindicator/raw/8508f7a52437679fd95a79b4630373f08315f189/f/nopython.patch"; - sha256 = "18b1xzvwsbhhfpbzf5zragij4g79pa04y1dk6v5ci1wsjvii725s"; - }) - ]; + preAutoreconf = '' + gtkdocize + ''; configureFlags = [ "CFLAGS=-Wno-error" |