summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/telegram/tdesktop
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-12-23 13:31:14 +0100
committerMichael Weiss <dev.primeos@gmail.com>2020-12-23 15:01:42 +0100
commit019eb959e39e9ca6e8ebc5f4603e10eaa04849a2 (patch)
tree887e8cb80d02bcef8d63234bf1f9c273ceeceed8 /pkgs/applications/networking/instant-messengers/telegram/tdesktop
parentb67ba0bfcc714453cdeb8d713e35751eb8b4c8f4 (diff)
downloadnixpkgs-019eb959e39e9ca6e8ebc5f4603e10eaa04849a2.tar
nixpkgs-019eb959e39e9ca6e8ebc5f4603e10eaa04849a2.tar.gz
nixpkgs-019eb959e39e9ca6e8ebc5f4603e10eaa04849a2.tar.bz2
nixpkgs-019eb959e39e9ca6e8ebc5f4603e10eaa04849a2.tar.lz
nixpkgs-019eb959e39e9ca6e8ebc5f4603e10eaa04849a2.tar.xz
nixpkgs-019eb959e39e9ca6e8ebc5f4603e10eaa04849a2.tar.zst
nixpkgs-019eb959e39e9ca6e8ebc5f4603e10eaa04849a2.zip
tdesktop: 2.4.7 -> 2.5.0
TODO: Add a "dev" output for tdesktop.tg_owt (now built as a shared
library).
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram/tdesktop')
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix7
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix13
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 6518f73a229..1e9574602d3 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -22,12 +22,12 @@ let
 
 in mkDerivation rec {
   pname = "telegram-desktop";
-  version = "2.4.7";
+  version = "2.5.0";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "1j2v29952l0am357pqvvgzm2zghmwhlr833kgp85hssxpr9xy4vv";
+    sha256 = "08y6krzhg8hipl7zgyda7ifi2ydxylb2snkslr7w5yj43rvc7hxj";
   };
 
   postPatch = ''
@@ -80,9 +80,6 @@ in mkDerivation rec {
   # TODO: Package mapbox-variant
 
   postFixup = ''
-    # Nuke refs to `tg_owt` which is introduced by `__FILE__` in headers.
-    remove-references-to -t ${tg_owt} $out/bin/telegram-desktop
-
     # This is necessary to run Telegram in a pure environment.
     # We also use gappsWrapperArgs from wrapGAppsHook.
     wrapProgram $out/bin/telegram-desktop \
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
index 48499bf9f2c..4139c597948 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
@@ -1,10 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, cmake, ninja, yasm
-, pkg-config, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio
+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm
+, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf
 }:
 
 let
-  rev = "e8fcae73947445db3d418fb7c20b964b59e14706";
-  sha256 = "0s2dd41r71aixhvympiqfks1liv7x78y60n0i87vmyxyfx449b5h";
+  rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39";
+  sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64";
 
 in stdenv.mkDerivation {
   pname = "tg_owt";
@@ -14,11 +14,14 @@ in stdenv.mkDerivation {
     owner = "desktop-app";
     repo = "tg_owt";
     inherit rev sha256;
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ pkg-config cmake ninja yasm ];
 
-  buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio ];
+  buildInputs = [
+    libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf
+  ];
 
   meta.license = lib.licenses.bsd3;
 }