ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

telepathy.glib: add python to passthru

Browse Source 
and let the telepathy plugins use it.
This commit is contained in:
Frederik Rietdijk 2016-11-18 18:29:43 +01:00
parent 78cf06e316
commit fda03ec4bd
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon { stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon
, sqlite, libsoup, libnice, gnutls }: , sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "telepathy-gabble-0.18.2"; name = "telepathy-gabble-0.18.2";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig libxslt ]; 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; ++ stdenv.lib.optional doCheck dbus_daemon;
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";

2
pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
}; };
buildInputs = [ glib telepathy_glib dbus_glib pidgin ]; buildInputs = [ glib telepathy_glib dbus_glib pidgin telepathy_glib.python ];
nativeBuildInputs = [ pkgconfig libxslt ]; nativeBuildInputs = [ pkgconfig libxslt ];

2
pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
}; };
buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt ]; buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt telepathy_glib.python ];
meta = { meta = {
description = "IRC connection manager for the Telepathy framework"; description = "IRC connection manager for the Telepathy framework";

2
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
View File

@ -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"; 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 buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool
gobjectIntrospection dbus_libs ]; gobjectIntrospection dbus_libs telepathy_glib.python ];
nativeBuildInputs = [ libxslt ]; nativeBuildInputs = [ libxslt ];

2
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi"; 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 # 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it
nativeBuildInputs = [ pkgconfig libxslt ]; nativeBuildInputs = [ pkgconfig libxslt ];

6
pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib { stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib
, python, sofia_sip }: , sofia_sip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-rakia"; pname = "telepathy-rakia";
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv"; sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv";
}; };
nativeBuildInputs = [pkgconfigUpstream libxslt python]; nativeBuildInputs = [pkgconfigUpstream libxslt ];
buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip]; buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip telepathy_glib.python ];
meta = { meta = {
homepage = http://telepathy.freedesktop.org; homepage = http://telepathy.freedesktop.org;

2
pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid openssl
sqlite pcre ]; sqlite pcre telepathy_glib.python ];
nativeBuildInputs = [ libxslt pkgconfigUpstream ]; nativeBuildInputs = [ libxslt pkgconfigUpstream ];

2
pkgs/development/libraries/telepathy/glib/default.nix
View File

@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
''; '';
passthru.python = python2;
meta = { meta = {
homepage = http://telepathy.freedesktop.org; homepage = http://telepathy.freedesktop.org;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;