Merge remote-tracking branch 'nixpkgs/nixos-unstable'

1 files changed, 34 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix b/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix
index 8bb7522b1976..9ab269aaacfc 100644
--- a/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix
@@ -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;