Merge branch 'nixpkgs-update' into master

1 files changed, 6 insertions, 6 deletions

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index 6513c6324a6..38ee5579b5a 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup
-, libuuid, openssl, pcre, sqlite, pkgconfig }:
+{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup
+, libuuid, openssl, pcre, sqlite, pkg-config }:
 
 stdenv.mkDerivation rec {
   pname = "telepathy-salut";
@@ -12,16 +12,16 @@ 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 pkgconfig ];
+  nativeBuildInputs = [ libxslt pkg-config ];
 
   configureFlags = [ "--disable-avahi-tests" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Link-local XMPP connection manager for Telepathy";
     platforms = platforms.gnu ++ platforms.linux; # Random choice
-    maintainers = [ maintainers.lethalman ];
+    maintainers = [ ];
     broken = true;
   };
 }