ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 05:37:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #202883 from dotlambda/telepathy-logger-python3

Browse Source 
telepathy-logger: build using python3
This commit is contained in:
Robert Schütz 2022-11-26 12:28:16 -08:00 committed by GitHub
commit 058b7ee575
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus { lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python3, libxml2, dbus-glib, dbus
, sqlite, libsoup, libnice, gnutls}: , sqlite, libsoup, libnice, gnutls
, fetchpatch
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-gabble"; pname = "telepathy-gabble";
@ -10,8 +12,15 @@ stdenv.mkDerivation rec {
sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i";
}; };
nativeBuildInputs = [ pkg-config libxslt ]; patches = [
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ]; (fetchpatch {
url = "https://github.com/archlinux/svntogit-packages/raw/edcf78c831894000f2fbfd3e5818e363911c746a/trunk/telepathy-gabble-0.18.4-python3.patch";
hash = "sha256-bvcZW6gbCNogqwPDaXHTbohe7c2GAYjXeHGyBEDVsB4=";
})
];
nativeBuildInputs = [ pkg-config libxslt python3 ];
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ];
checkInputs = [ dbus.daemon ]; checkInputs = [ dbus.daemon ];

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

@ -1,26 +1,17 @@
{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }: { lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python3, glib, dbus-glib, pkg-config, libxslt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-haze"; pname = "telepathy-haze";
version = "0.8.0"; version = "0.8.1";
src = fetchurl { src = fetchurl {
url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze${version}.tar.gz"; url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-${version}.tar.gz";
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; hash = "sha256-cEvvpC7sIXPspLrAH/0AQBRmXyutRtyJSOVCM2TN4wo=";
}; };
buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ]; buildInputs = [ glib telepathy-glib dbus-glib pidgin ];
nativeBuildInputs = [ pkg-config libxslt ]; nativeBuildInputs = [ pkg-config libxslt python3 ];
patches = [
# Patch from Gentoo that helps telepathy-haze build with more
# recent versions of pidgin.
(fetchpatch {
url = "https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch";
sha256 = "0fa1p4n1559qd096w7ya4kvfnc1c98ykarkxzlpkwvzbczwzng3c";
})
];
meta = { meta = {
description = "A Telepathy connection manager based on libpurple"; description = "A Telepathy connection manager based on libpurple";

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

@ -1,16 +1,16 @@
{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }: { lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python3, libxslt, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-idle"; pname = "telepathy-idle";
version = "0.2.0"; version = "0.2.2";
src = fetchurl { src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; hash = "sha256-g4fiXl+wtMvnAeXcCS1mbWUQuDP9Pn5GLpFw027DwV8=";
}; };
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config python3 makeWrapper ];
buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ]; buildInputs = [ glib telepathy-glib dbus-glib libxslt (lib.getLib dconf) ];
preFixup = '' preFixup = ''
wrapProgram "$out/libexec/telepathy-idle" \ wrapProgram "$out/libexec/telepathy-idle" \

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

@ -1,5 +1,7 @@
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config { lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python3, pkg-config
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus
, fetchpatch
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "telepathy-logger"; pname = "telepathy-logger";
@ -10,12 +12,20 @@ stdenv.mkDerivation rec {
sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg";
}; };
patches = [
(fetchpatch {
url = "https://github.com/archlinux/svntogit-packages/raw/2b5bdbb4739d3517f5e7300edc8dab775743b96d/trunk/0001-tools-Fix-the-build-with-Python-3.patch";
hash = "sha256-o1lfdZIIqaxn7ntQZnoOMqquc6efTHgSIxB5dpFWRgg=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper pkg-config intltool libxslt gobject-introspection makeWrapper pkg-config intltool libxslt gobject-introspection
python3
]; ];
buildInputs = [ buildInputs = [
dbus-glib libxml2 sqlite telepathy-glib dbus-glib libxml2 sqlite telepathy-glib
dbus python2 dbus
]; ];
configureFlags = [ "--enable-call" ]; configureFlags = [ "--enable-call" ];