Merge pull request #115620 from r-ryantm/auto-update/telepathy-glib
telepathy-glib: 0.24.1 -> 0.24.2
This commit is contained in:
commit
3d92c78160
|
@ -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}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
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 ];
|
||||
|
||||
|
|
|
@ -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 {
|
||||
pname = "telepathy-haze";
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
|
||||
};
|
||||
|
||||
buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ];
|
||||
buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config libxslt ];
|
||||
|
||||
|
|
|
@ -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 {
|
||||
pname = "telepathy-idle";
|
||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
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 = ''
|
||||
wrapProgram "$out/libexec/telepathy-idle" \
|
||||
|
|
|
@ -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 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
buildInputs = [
|
||||
dbus-glib libxml2 sqlite telepathy-glib
|
||||
dbus telepathy-glib.python
|
||||
dbus python2
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-call" ];
|
||||
|
|
|
@ -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 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -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 telepathy-glib.python ];
|
||||
sqlite pcre python2 ];
|
||||
|
||||
nativeBuildInputs = [ libxslt pkg-config ];
|
||||
|
||||
|
|
|
@ -1,24 +1,49 @@
|
|||
{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt
|
||||
, gobject-introspection, vala, glibcLocales }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, dbus-glib
|
||||
, glib
|
||||
, python3
|
||||
, pkg-config
|
||||
, libxslt
|
||||
, gobject-introspection
|
||||
, vala
|
||||
, glibcLocales
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "telepathy-glib-0.24.1";
|
||||
pname = "telepathy-glib";
|
||||
version = "0.24.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
|
||||
sha256 = "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy";
|
||||
url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz";
|
||||
sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
libxslt
|
||||
gobject-introspection
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glibcLocales
|
||||
python3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dbus-glib
|
||||
glib
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-vala-bindings"
|
||||
];
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
propagatedBuildInputs = [ dbus-glib glib ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ];
|
||||
buildInputs = [ glibcLocales python2 ];
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
@ -26,8 +51,6 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
|
||||
'';
|
||||
|
||||
passthru.python = python2;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://telepathy.freedesktop.org";
|
||||
platforms = platforms.unix;
|
||||
|
|
Loading…
Reference in a new issue