about summary refs log tree commit diff
path: root/pkgs/applications/networking
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2024-02-06 14:13:56 -0500
committerGitHub <noreply@github.com>2024-02-06 14:13:56 -0500
commit7044eb382f12064de3b46f62d74ca799042691b8 (patch)
tree58cfb7f3c16b33ac4387f144470b982d1718bd81 /pkgs/applications/networking
parente1b96fe7ab0eb5568b38dac8d8f21cb001a65621 (diff)
parentc3ada6df120c5e387905a7b94720ee98c01e6670 (diff)
downloadnixlib-7044eb382f12064de3b46f62d74ca799042691b8.tar
nixlib-7044eb382f12064de3b46f62d74ca799042691b8.tar.gz
nixlib-7044eb382f12064de3b46f62d74ca799042691b8.tar.bz2
nixlib-7044eb382f12064de3b46f62d74ca799042691b8.tar.lz
nixlib-7044eb382f12064de3b46f62d74ca799042691b8.tar.xz
nixlib-7044eb382f12064de3b46f62d74ca799042691b8.tar.zst
nixlib-7044eb382f12064de3b46f62d74ca799042691b8.zip
Merge pull request #285603 from NickCao/telegram-desktop
telegram-desktop: 4.14.9 -> 4.14.12
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
index b8e530545b76..404628ef2846 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@@ -64,14 +64,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "telegram-desktop";
-  version = "4.14.9";
+  version = "4.14.13";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-VqLCkGav6qtam9qk2MsjCdyVSj3630FGQg50Mv0OBNE=";
+    hash = "sha256-JcW/gXSgtzxv/37V13brHsa4XcVyB5ZCiPj4slMFdro=";
   };
 
   patches = [
@@ -87,13 +87,16 @@ stdenv.mkDerivation rec {
 
   postPatch = lib.optionalString stdenv.isLinux ''
     substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
-      --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
+      --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
     substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \
-      --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
+      --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"'
     substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \
-      --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
+      --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"'
     substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \
-      --replace '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"'
+      --replace-fail '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"'
+  '' + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \
+      --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
   '';
 
   # We want to run wrapProgram manually (with additional parameters)