summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/telegram
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-06-02 14:39:06 +0800
committerNick Cao <nickcao@nichi.co>2023-06-03 09:52:55 +0800
commit4fb5325fdffde1eb457d819a46d8fe08ee1ca4a2 (patch)
tree3bdf894ff4d7642b876afec729e8a759d85f0609 /pkgs/applications/networking/instant-messengers/telegram
parent9eee76ae0d5961994183eba52326320e467b74b4 (diff)
downloadnixpkgs-4fb5325fdffde1eb457d819a46d8fe08ee1ca4a2.tar
nixpkgs-4fb5325fdffde1eb457d819a46d8fe08ee1ca4a2.tar.gz
nixpkgs-4fb5325fdffde1eb457d819a46d8fe08ee1ca4a2.tar.bz2
nixpkgs-4fb5325fdffde1eb457d819a46d8fe08ee1ca4a2.tar.lz
nixpkgs-4fb5325fdffde1eb457d819a46d8fe08ee1ca4a2.tar.xz
nixpkgs-4fb5325fdffde1eb457d819a46d8fe08ee1ca4a2.tar.zst
nixpkgs-4fb5325fdffde1eb457d819a46d8fe08ee1ca4a2.zip
telegram-desktop: 4.8.1 -> 4.8.3
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix19
1 files changed, 15 insertions, 4 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 4c113e7f2d0..3fa19c21ba7 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@@ -6,6 +6,7 @@
 , cmake
 , ninja
 , python3
+, gobject-introspection
 , wrapGAppsHook
 , wrapQtAppsHook
 , extra-cmake-modules
@@ -13,8 +14,9 @@
 , qtwayland
 , qtsvg
 , qtimageformats
-, qt5compat
 , gtk3
+, boost
+, fmt
 , libdbusmenu
 , lz4
 , xxHash
@@ -74,14 +76,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "telegram-desktop";
-  version = "4.8.1";
+  version = "4.8.3";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "0mxxfh70dffkrq76nky3pwrk10s1q4ahxx2ddb58dz8igq6pl4zi";
+    hash = "sha256-fvg9SFHRHeJVogYQ+vyVqGyLGnOjM5Osi3H0SNGe9fY=";
   };
 
   patches = [
@@ -103,6 +105,8 @@ stdenv.mkDerivation rec {
       --replace '"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"'
+    substituteInPlace cmake/external/glib/CMakeLists.txt \
+      --replace 'add_subdirectory(cppgir)' 'add_subdirectory(cppgir EXCLUDE_FROM_ALL)'
   '';
 
   # We want to run wrapProgram manually (with additional parameters)
@@ -114,6 +118,7 @@ stdenv.mkDerivation rec {
     cmake
     ninja
     python3
+    gobject-introspection
     wrapGAppsHook
     wrapQtAppsHook
     extra-cmake-modules
@@ -124,8 +129,9 @@ stdenv.mkDerivation rec {
     qtwayland
     qtsvg
     qtimageformats
-    qt5compat
     gtk3
+    boost
+    fmt
     libdbusmenu
     lz4
     xxHash
@@ -174,6 +180,11 @@ stdenv.mkDerivation rec {
     "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
   ];
 
+  preBuild = ''
+    # for cppgir to locate gir files
+    export GI_GIR_PATH="$XDG_DATA_DIRS"
+  '';
+
   postFixup = ''
     # This is necessary to run Telegram in a pure environment.
     # We also use gappsWrapperArgs from wrapGAppsHook.