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

telepathy-glib: do not propagate python

Browse Source 
Python is only used as build tool these days so it is not necessary to ensure consistency across telepathy packages.
This commit is contained in:
Jan Tojnar 2021-03-11 15:52:09 +01:00
parent 4330c90149
commit 8f3169ab3d
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
6 changed files with 10 additions and 12 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,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus { lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus
, sqlite, libsoup, libnice, gnutls}: , sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config libxslt ]; nativeBuildInputs = [ pkg-config libxslt ];
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]; buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ];
checkInputs = [ dbus.daemon ]; checkInputs = [ dbus.daemon ];

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }: { lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-haze"; pname = "telepathy-haze";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
}; };
buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ]; buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ];
nativeBuildInputs = [ pkg-config libxslt ]; nativeBuildInputs = [ pkg-config libxslt ];

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }: { lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-idle"; pname = "telepathy-idle";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ]; buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ];
preFixup = '' preFixup = ''
wrapProgram "$out/libexec/telepathy-idle" \ wrapProgram "$out/libexec/telepathy-idle" \

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config { lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
dbus-glib libxml2 sqlite telepathy-glib dbus-glib libxml2 sqlite telepathy-glib
dbus telepathy-glib.python dbus python2
]; ];
configureFlags = [ "--enable-call" ]; configureFlags = [ "--enable-call" ];

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup { lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup
, libuuid, openssl, pcre, sqlite, pkg-config }: , libuuid, openssl, pcre, sqlite, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -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 telepathy-glib.python ]; sqlite pcre python2 ];
nativeBuildInputs = [ libxslt pkg-config ]; nativeBuildInputs = [ libxslt pkg-config ];

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

@ -26,8 +26,6 @@ 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 = with lib; { meta = with lib; {
homepage = "https://telepathy.freedesktop.org"; homepage = "https://telepathy.freedesktop.org";
platforms = platforms.unix; platforms = platforms.unix;