swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

tdesktop: 3.6.0 -> 3.7.3

Browse source
This commit is contained in:
Nick Cao 2022-04-18 21:04:35 +08:00
parent 5baa20d7c8
commit 33775ec9a2
No known key found for this signature in database
GPG key ID: 068A56CEF48FA2C1
4 changed files with 11 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file

@ -1,5 +1,4 @@
{ mkDerivation
, lib
{ lib
, fetchFromGitHub
, callPackage
, pkg-config
@ -10,9 +9,10 @@
, wrapQtAppsHook
, extra-cmake-modules
, qtbase
, qtsvg
, qtimageformats
, qt5compat
, gtk3
, kwayland
, libdbusmenu
, lz4
, xxHash
@ -70,7 +70,7 @@ let
in
env.mkDerivation rec {
pname = "telegram-desktop";
version = "3.6.0";
version = "3.7.3";
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
# Telegram-Desktop with submodules
@ -79,17 +79,9 @@ env.mkDerivation rec {
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0zcjm08nfdlxrsv0fi6dqg3lk52bcvsxnsf6jm5fv6gf5v9ia3hq";
sha256 = "01b3nrhfbxhq4w63nsjnrhyfsdq3fm4l7sfkasbh8ib4qk3c9vwz";
};
patches = [
# fix build with KWayland 5.94+
# cf. https://invent.kde.org/frameworks/kwayland/-/commit/de442e4a94e249a29cf2e005db8e0a5e4a6a13ed
# upstream bug: https://github.com/telegramdesktop/tdesktop/issues/24375
# FIXME remove when no longer necessary
./kf594.diff
];
postPatch = ''
substituteInPlace Telegram/CMakeLists.txt \
--replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'
@ -120,9 +112,10 @@ env.mkDerivation rec {
buildInputs = [
qtbase
qtsvg
qtimageformats
qt5compat
gtk3
kwayland
libdbusmenu
lz4
xxHash
@ -166,8 +159,6 @@ env.mkDerivation rec {
"-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c"
# See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649
"-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
# TODO: Remove once QT6 is available in nixpkgs
"-DDESKTOP_APP_QT6=OFF"
];
postFixup = ''

57
pkgs/applications/networking/instant-messengers/telegram/tdesktop/kf594.diff
View file

@ -1,57 +0,0 @@
diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
index 7641579aa..3c195e397 100644
--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/platform/base_platform_info.h"
-#include <connection_thread.h>
-#include <registry.h>
-#include <surface.h>
-#include <plasmashell.h>
+#include <KWayland/Client/connection_thread.h>
+#include <KWayland/Client/registry.h>
+#include <KWayland/Client/surface.h>
+#include <KWayland/Client/plasmashell.h>
using namespace KWayland::Client;
Submodule Telegram/lib_base contains modified content
diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
index 32f0de6..30a087f 100644
--- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtCore/QPointer>
#include <QtGui/QWindow>
-#include <connection_thread.h>
-#include <registry.h>
-#include <surface.h>
-#include <xdgforeign.h>
-#include <idleinhibit.h>
+#include <KWayland/Client/connection_thread.h>
+#include <KWayland/Client/registry.h>
+#include <KWayland/Client/surface.h>
+#include <KWayland/Client/xdgforeign.h>
+#include <KWayland/Client/idleinhibit.h>
using namespace KWayland::Client;
Submodule Telegram/lib_ui contains modified content
diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
index 01f1e80..163cb6a 100644
--- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <private/qwaylandwindow_p.h>
#include <private/qwaylandshellsurface_p.h>
-#include <connection_thread.h>
-#include <registry.h>
+#include <KWayland/Client/connection_thread.h>
+#include <KWayland/Client/registry.h>
Q_DECLARE_METATYPE(QMargins);

6
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation {
pname = "tg_owt";
version = "unstable-2022-02-25";
version = "unstable-2022-04-14";
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
rev = "a264028ec71d9096e0aa629113c49c25db89d260";
sha256 = "10p3x8z3ps8s1ivi9y8px2gsg4pvsvz6g9wbgh5w8hilikxqq7r5";
rev = "63a934db1ed212ebf8aaaa20f0010dd7b0d7b396";
sha256 = "sha256-WddSsQ9KW1zYyYckzdUOvfFZArYAbyvXmABQNMtK6cM=";
fetchSubmodules = true;
};

2
pkgs/top-level/all-packages.nix
View file

@ -29864,7 +29864,7 @@ with pkgs;
taskopen = callPackage ../applications/misc/taskopen { };
tdesktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
tdesktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
abseil-cpp = abseil-cpp_202111;
};