public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libayatana-appindicator: 0.5.4 -> 0.5.5, generate typelibs for gobject-introspection 

libayatana-indicator: 0.6.3 -> 0.8.2
This commit is contained in:
Nick Hu 2020-10-13 14:13:10 +01:00
parent 2c5bee7e93
commit f0cd405827
No known key found for this signature in database
GPG Key ID: 9E35DDA3DF631330
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/ayatana-ido/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, pkgconfig, autoreconfHook , pkg-config, autoreconfHook
, gtk3, gobject-introspection, gtk-doc, vala , gtk3, gobject-introspection, gtk-doc, vala
}: }:
@ -14,16 +14,16 @@ stdenv.mkDerivation rec {
sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p"; sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc vala ]; nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc vala gobject-introspection ];
buildInputs = [ gtk3 gobject-introspection ]; buildInputs = [ gtk3 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Ayatana Display Indicator Objects"; description = "Ayatana Display Indicator Objects";
homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; homepage = "https://github.com/AyatanaIndicators/ayatana-ido";
changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog";
license = [ licenses.gpl3 licenses.lgpl21 ]; license = [ licenses.lgpl3Plus licenses.lgpl21Plus ];
maintainers = [ maintainers.nickhu ]; maintainers = [ maintainers.nickhu ];
platforms = platforms.x86_64; platforms = platforms.linux;
}; };
} }

19
pkgs/development/libraries/libayatana-appindicator/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, lib { stdenv, fetchFromGitHub, lib
, pkgconfig, autoreconfHook , gtk-doc , pkg-config, autoreconfHook , gtk-doc
, gobject-introspection
, gtkVersion ? "3" , gtkVersion ? "3"
, gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2 , gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2
, gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3 , gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3
@ -8,24 +9,24 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libayatana-appindicator-gtk${gtkVersion}"; pname = "libayatana-appindicator-gtk${gtkVersion}";
version = "0.5.4"; version = "0.5.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AyatanaIndicators"; owner = "AyatanaIndicators";
repo = "libayatana-appindicator"; repo = "libayatana-appindicator";
rev = version; rev = version;
sha256 = "0bqjqb7gabdk7mifk8azi630qw39z978f973fx2ylgdgr4a66j1v"; sha256 = "1sba0w455rdkadkhxrx4fr63m0d9blsbb1q1hcshxw1k1z2nh1gk";
}; };
patchPhase = '' prePatch = ''
substituteInPlace configure.ac \ substituteInPlace configure.ac \
--replace "codegendir pygtk-2.0" "codegendir pygobject-2.0" --replace "codegendir pygtk-2.0" "codegendir pygobject-2.0"
''; '';
nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc ]; nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection python2 python2Packages.pygtk dbus-glib ];
buildInputs = [ dbus-glib python2 python2Packages.pygtk ] buildInputs =
++ lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2 lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2
++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3; ++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3;
propagatedBuildInputs = propagatedBuildInputs =
@ -42,8 +43,8 @@ stdenv.mkDerivation rec {
description = "Ayatana Application Indicators Shared Library"; description = "Ayatana Application Indicators Shared Library";
homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator"; homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator";
changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog"; changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog";
license = [ licenses.gpl3 licenses.lgpl21 ]; license = [ licenses.lgpl3Plus licenses.lgpl21Plus ];
maintainers = [ maintainers.nickhu ]; maintainers = [ maintainers.nickhu ];
platforms = platforms.x86_64; platforms = platforms.linux;
}; };
} }

12
pkgs/development/libraries/libayatana-indicator/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, lib { stdenv, fetchFromGitHub, lib
, pkgconfig, autoreconfHook , pkg-config, autoreconfHook
, gtkVersion ? "3" , gtkVersion ? "3"
, gtk2 , gtk2
, gtk3 , gtk3
@ -8,16 +8,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libayatana-indicator-gtk${gtkVersion}"; pname = "libayatana-indicator-gtk${gtkVersion}";
version = "0.6.3"; version = "0.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AyatanaIndicators"; owner = "AyatanaIndicators";
repo = "libayatana-indicator"; repo = "libayatana-indicator";
rev = version; rev = version;
sha256 = "1q9wmaw6pckwyrv0s7wkqzm1yrk031pbz4xbr8cwn75ixqyfcb28"; sha256 = "1wlqm3pj12vgz587a72widbg0vcmm1klsd2lh3mpzfy20m3vjxhj";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ ayatana-ido ] buildInputs = [ ayatana-ido ]
++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ] ++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ]
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
description = "Ayatana Indicators Shared Library"; description = "Ayatana Indicators Shared Library";
homepage = "https://github.com/AyatanaIndicators/libayatana-indicator"; homepage = "https://github.com/AyatanaIndicators/libayatana-indicator";
changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog"; changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog";
license = licenses.gpl3; license = licenses.gpl3Plus;
maintainers = [ maintainers.nickhu ]; maintainers = [ maintainers.nickhu ];
platforms = platforms.x86_64; platforms = platforms.linux;
}; };
} }