mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-24 20:02:58 +03:00
telepathy.glib: add python to passthru
and let the telepathy plugins use it.
This commit is contained in:
parent
78cf06e316
commit
fda03ec4bd
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libxslt ];
|
||||
buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]
|
||||
buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls telepathy_glib.python ]
|
||||
++ stdenv.lib.optional doCheck dbus_daemon;
|
||||
|
||||
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
|
||||
};
|
||||
|
||||
buildInputs = [ glib telepathy_glib dbus_glib pidgin ];
|
||||
buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libxslt ];
|
||||
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt ];
|
||||
buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python ];
|
||||
|
||||
meta = {
|
||||
description = "IRC connection manager for the Telepathy framework";
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
|
||||
|
||||
buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool
|
||||
gobjectIntrospection dbus_libs ];
|
||||
gobjectIntrospection dbus_libs telepathy_glib.python ];
|
||||
|
||||
nativeBuildInputs = [ libxslt ];
|
||||
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi";
|
||||
};
|
||||
|
||||
buildInputs = [ telepathy_glib makeWrapper /*upower*/ ]; # ToDo: optional stuff missing
|
||||
buildInputs = [ telepathy_glib telepathy_glib.python makeWrapper /*upower*/ ]; # ToDo: optional stuff missing
|
||||
# 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libxslt ];
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib
|
||||
, python, sofia_sip }:
|
||||
, sofia_sip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-rakia";
|
||||
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [pkgconfigUpstream libxslt python];
|
||||
buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip];
|
||||
nativeBuildInputs = [pkgconfigUpstream libxslt ];
|
||||
buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip telepathy_glib.python ];
|
||||
|
||||
meta = {
|
||||
homepage = http://telepathy.freedesktop.org;
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
|
||||
buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl
|
||||
sqlite pcre ];
|
||||
sqlite pcre telepathy_glib.python ];
|
||||
|
||||
nativeBuildInputs = [ libxslt pkgconfigUpstream ];
|
||||
|
||||
|
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
|
||||
'';
|
||||
|
||||
passthru.python = python2;
|
||||
|
||||
meta = {
|
||||
homepage = http://telepathy.freedesktop.org;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
|
Loading…
Reference in New Issue
Block a user