about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/telepathy
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-11-17 16:29:59 +0100
committerJan Tojnar <jtojnar@gmail.com>2020-11-17 18:14:13 +0100
commit3a707939047059a6e1200697ac2b239df4365735 (patch)
tree51421231280d368b1344c7f10f548cb3bd2edfa4 /pkgs/applications/networking/instant-messengers/telepathy
parent9b7d444159cf9b4e0eaa40cccf35db3bdb6613cd (diff)
telepathy-mission-control: 5.16.5 → 5.16.6
just includes a fix we were already cherry-picking:

https://github.com/TelepathyIM/telepathy-mission-control/commit/67df52b68b28e2a3755702b669a58747e21dd12b
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telepathy')
-rw-r--r--pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix21
1 files changed, 5 insertions, 16 deletions
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 a6e74443f2917..bc0657f7b1a73 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchurl
-, fetchpatch
-, pkgconfig
+, pkg-config
 , dconf
 , telepathy-glib
 , python3
@@ -11,31 +10,21 @@
 
 stdenv.mkDerivation rec {
   pname = "telepathy-mission-control";
-  version = "5.16.5";
+  version = "5.16.6";
 
   outputs = [ "out" "lib" "dev" ];
 
   src = fetchurl {
     url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc";
+    sha256 = "0ibs575pfr0wmhfcw6ln6iz7gw2y45l3bah11rksf6g9jlwsxy1d";
   };
 
-  patches = [
-    # Fix property name (new GLib is stricter)
-    # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-601494939
-    # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/141
-    (fetchpatch {
-      url = "https://github.com/TelepathyIM/telepathy-mission-control/commit/d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910.patch";
-      sha256 = "1rchl0lyfj5c3yhl63spzvx9b6ny3967dlq4hgp9qhqn0zjra3sb";
-    })
-  ];
-
   buildInputs = [
     python3
   ]; # ToDo: optional stuff missing
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
     libxslt
     makeWrapper
   ];
@@ -57,7 +46,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "An account manager and channel dispatcher for the Telepathy framework";
     homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/";
-    license = licenses.lgpl21;
+    license = licenses.lgpl21Only;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;
   };