diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-22 22:28:39 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-07-22 22:28:39 +0200 |
commit | b9045a7d9651a2f8a0bbc8c86cd72f970e951068 (patch) | |
tree | 75ee378fba0bae606e350cb145c2589636a2c660 /pkgs/applications/networking/instant-messengers | |
parent | 402688b752a4b2c5548a1d07aed4fbbde2b55e87 (diff) | |
parent | adc2edd5cf524239690b5cf49779a11fd2eb061b (diff) | |
download | nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.gz nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.bz2 nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.lz nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.xz nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.tar.zst nixlib-b9045a7d9651a2f8a0bbc8c86cd72f970e951068.zip |
Merge branch 'x-updates' into staging
...in preparation for a merge to master
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix | 17 |
2 files changed, 22 insertions, 9 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 8a945bc7e2d0..e8e76c10ea5e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon , sqlite, libsoup, libnice, gnutls }: stdenv.mkDerivation rec { - name = "telepathy-gabble-0.17.2"; + name = "telepathy-gabble-0.18.2"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz"; - sha256 = "137sslbgh0326lmwihcr2ybljgq9mzsx5wnciilpx884si22wpk8"; + sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9"; }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]; + buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ] + ++ stdenv.lib.optional doCheck dbus_daemon; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; - meta = { + enableParallelBuilding = true; + doCheck = true; + + meta = with stdenv.lib; { homepage = http://telepathy.freedesktop.org; description = "Jabber/XMPP connection manager for the Telepathy framework"; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index a8142fc1e5cf..b463ff2f2307 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,20 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper, upower }: stdenv.mkDerivation rec { - name = "${pname}-5.16.0"; + name = "${pname}-5.16.2"; pname = "telepathy-mission-control"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "1l61w6j04mbrjsbcfrlc0safh9nlsjnj0z6lszal64r9bhkcghzd"; + sha256 = "1sk8f9jfaxgbsniz0n5hmrcwvxla3x8axjcnjbppg7nidk9gijrx"; }; - buildInputs = [ telepathy_glib makeWrapper ]; + buildInputs = [ telepathy_glib makeWrapper upower ]; # ToDo: optional stuff missing nativeBuildInputs = [ pkgconfig libxslt ]; + doCheck = true; + preFixup = '' wrapProgram "$out/libexec/mission-control-5" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + + meta = with stdenv.lib; { + description = "An account manager and channel dispatcher for the Telepathy framework"; + homepage = http://telepathy.freedesktop.org/wiki/; + license = licenses.lgpl21; + platforms = platforms.unix; + }; } |