git.iko.soy/typeable/nixpkgs
on master help sign in
telepathy-glib: do not propagate python

Python is only used as build tool these days so it is not necessary to ensure consistency across telepathy packages.

commit8f3169ab3d9fbf118968f2801fc96f517ccc17e6 authorJan Tojnar <jtojnar@gmail.com> dateThu 11 Mar 2021, 15:52 (6 years ago) parent4330c90
6 files changed+10−12
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix+2−2 pkgs/development/libraries/telepathy/glib/default.nix−2
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus
1+{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus
22, sqlite, libsoup, libnice, gnutls}:
33
44stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 nativeBuildInputs = [ pkg-config libxslt ];
13− buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ];
13+ buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ];
1414
1515 checkInputs = [ dbus.daemon ];
1616
pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }:
1+{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }:
22
33stdenv.mkDerivation rec {
44 pname = "telepathy-haze";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
1010 };
1111
12− buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ];
12+ buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ];
1313
1414 nativeBuildInputs = [ pkg-config libxslt ];
1515
pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
1+{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 pname = "telepathy-idle";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 nativeBuildInputs = [ pkg-config makeWrapper ];
13− buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ];
13+ buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ];
1414
1515 preFixup = ''
1616 wrapProgram "$out/libexec/telepathy-idle" \
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config
1+{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config
22, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
33
44stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 ];
1616 buildInputs = [
1717 dbus-glib libxml2 sqlite telepathy-glib
18− dbus telepathy-glib.python
18+ dbus python2
1919 ];
2020
2121 configureFlags = [ "--enable-call" ];
pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup
1+{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup
22, libuuid, openssl, pcre, sqlite, pkg-config }:
33
44stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046
1414 buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl
15− sqlite pcre telepathy-glib.python ];
15+ sqlite pcre python2 ];
1616
1717 nativeBuildInputs = [ libxslt pkg-config ];
1818
pkgs/development/libraries/telepathy/glib/default.nix−2
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
2626 substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
2727 '';
2828
29− passthru.python = python2;
30−
3129 meta = with lib; {
3230 homepage = "https://telepathy.freedesktop.org";
3331 platforms = platforms.unix;