diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-07-09 22:10:46 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-07-09 22:13:29 +0200 |
| commit | 5979d428b41dc759a139a4a71096697fb76d004d (patch) | |
| tree | 04abac3d3977183c6b82785aa0e63722bc97851d /pkgs/applications/networking/instant-messengers | |
| parent | 73ad32e1d94f5c774e4f5e685a7efba51a997c78 (diff) | |
| parent | 1ecae5c2c123c0ca615d011b9ce32f501198e7c4 (diff) | |
| download | nixlib-5979d428b41dc759a139a4a71096697fb76d004d.tar nixlib-5979d428b41dc759a139a4a71096697fb76d004d.tar.gz nixlib-5979d428b41dc759a139a4a71096697fb76d004d.tar.bz2 nixlib-5979d428b41dc759a139a4a71096697fb76d004d.tar.lz nixlib-5979d428b41dc759a139a4a71096697fb76d004d.tar.xz nixlib-5979d428b41dc759a139a4a71096697fb76d004d.tar.zst nixlib-5979d428b41dc759a139a4a71096697fb76d004d.zip | |
Merge recent master into x-updates
Hydra: ?compare=1134869 Conflicts (just meta): pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 7f9ffa8f5d90..e8e76c10ea5e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9"; }; - nativeBuildInputs = [pkgconfig libxslt]; + nativeBuildInputs = [ pkgconfig libxslt ]; buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ] ++ stdenv.lib.optional doCheck dbus_daemon; @@ -19,9 +19,8 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - description = "A Jabber/XMPP connection manager for the Telepathy framework"; homepage = http://telepathy.freedesktop.org; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + description = "Jabber/XMPP connection manager for the Telepathy framework"; + platforms = stdenv.lib.platforms.gnu; }; } |