summaryrefslogtreecommitdiffstats
path: root/pkgs/applications
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2021-01-28 21:04:08 +0100
committerMichael Weiss <dev.primeos@gmail.com>2021-01-30 00:38:48 +0100
commit2b66bbd84570fcccfae4bbce0fd101c723bb92a0 (patch)
tree0ae5e62ebec08560ca0a37e0e013f64b9362a297 /pkgs/applications
parent78da1c502b140a5b91d795bf3053fe83a422c643 (diff)
tdesktop: 2.5.1 -> 2.5.7
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix9
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 20da2a65dc26..0f219286744b 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.5.1";
+ version = "2.5.7";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
- sha256 = "1qpap599h2c4hlmr00k82r6138ym4zqrbfpvm97gm97adn3mxk7i";
+ sha256 = "1f6jsdm1kzf8l5zlbmvqz6xa771v2zc9fa92gn8s6d4nb83zr77b";
};
postPatch = ''
@@ -44,7 +44,7 @@ in mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ];
buildInputs = [
- qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
+ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash
dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
tl-expected hunspell
tg_owt
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 2853418da0e3..b5a6579db57c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
@@ -3,8 +3,8 @@
}:
let
- rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39";
- sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64";
+ rev = "be23804afce3bb2e80a1d57a7c1318c71b82b7de";
+ sha256 = "0avdxkig8z1ainzyxkm9vmlvkyqbjalwb4h9s9kcail82mnldnhc";
in stdenv.mkDerivation {
pname = "tg_owt";
@@ -25,5 +25,10 @@ in stdenv.mkDerivation {
libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf
];
+ cmakeFlags = [
+ # Building as a shared library isn't officially supported and currently broken:
+ "-DBUILD_SHARED_LIBS=OFF"
+ ];
+
meta.license = lib.licenses.bsd3;
}