From ea0b0e31e17204d394425e53fcb1f4ea184b20ef Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 13 Jul 2021 12:03:37 +0100 Subject: [PATCH 1/9] bat: 0.18.1 -> 0.18.2 (cherry picked from commit ebf9a91123ccbfaf42bbc91c5fb897bfbd4d0721) --- pkgs/tools/misc/bat/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 8bc82547eeb..81b910117f1 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , nixosTests , rustPlatform , fetchFromGitHub @@ -12,16 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kyl+clL/4uxVaDH/9zPDGQTir4/JVgtHo9kNQ31gXTo="; + sha256 = "sha256-Y8CmVOIDPQ9kpggOlKnxLV0oOyNRow0r/nvxNpCtYNU="; }; - - cargoSha256 = "sha256-j9HbOXiwN4CWv9wMBrNxY3jehh+KRkXlwmDqChNy1Dk="; + cargoSha256 = "sha256-MdfBldImyW8QV0P3zPrYT2Vi9zChvXePI2T8tRsrlcQ="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 - installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{fish,zsh} + installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{bash,fish,zsh} ''; # Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as From d73ddfe782358fc3507b5153cc09874503299d89 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 26 Jun 2021 16:17:07 +0200 Subject: [PATCH 2/9] tdesktop: 2.7.5 -> 2.8.0 (cherry picked from commit 0d509d366d4fc692a9dc81366445e29da81202e6) --- .../telegram/tdesktop/default.nix | 20 +++--------- .../telegram/tdesktop/tg_owt.nix | 32 +++++++++++++------ .../libraries/libtgvoip/default.nix | 25 ++++++++++++--- 3 files changed, 48 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 5997de14edb..b02a10aaa23 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,8 +1,9 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, callPackage +{ mkDerivation, lib, fetchurl, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk +, rnnoise, abseil-cpp, extra-cmake-modules # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy , at-spi2-core, libXtst, libthai, libdatrie @@ -22,26 +23,14 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.7.5"; + version = "2.8.0"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "sha256-9GxBw5ii9Musjq7D3KMf/P5BA4h690EgXRbhynHwO98="; + sha256 = "0689bmdpsj8qmv9ih6ckay23mivhlps8c081qljb8wqplmf2c4ds"; }; - patches = [ - # fixes issue with ffmpeg>=4.4 crashes, hasn't been upstreamed yet - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/1c91884873968997be4b0c954169d04dc839f1db/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-crash.patch"; - sha256 = "sha256-inLXcP70yJlkkmdeXlc3HRL7Vt+Sf00LLJG33gwBKdY="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/gentoo/1c91884873968997be4b0c954169d04dc839f1db/net-im/telegram-desktop/files/tdesktop-2.7.4-voice-ffmpeg44.patch"; - sha256 = "sha256-p57LipNf7BDhVvNKRuicVqx0vU6IBL/Cvr5BAfLF4Hs="; - }) - ]; - postPatch = '' substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' @@ -66,6 +55,7 @@ in mkDerivation rec { qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk + rnnoise abseil-cpp extra-cmake-modules tg_owt # Transitive dependencies: pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy 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 6bd72134e02..eb2d3215349 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,30 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm +{ lib, stdenv, fetchFromGitHub, fetchpatch +, pkg-config, cmake, ninja, yasm , libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf -, xorg, libXtst +, xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr +, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire }: -let - rev = "2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3"; - sha256 = "0kz0i381iwsgcc3yzsq7njx3gkqja4bb9fsgc24vhg0md540qhyn"; - -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "tg_owt"; - version = "git-${rev}"; + version = "unstable-2021-06-17"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - inherit rev sha256; + rev = "f03ef05abf665437649a4f71886db1343590e862"; + sha256 = "0s6ajw52b95lcq4mn6lv8gj6lhv62bvwjh43w7az2k5pbm14v7vv"; fetchSubmodules = true; }; + patches = [ + # Our libXtst seems broken: + # /nix/store/rd3swxwmzjgjvwhz8svyc8ghc0brq293-libXtst-1.2.3/include/X11/extensions/XTest.h:32:10: fatal error: X11/extensions/XInput.h: No such file or directory + (fetchpatch { + # Copy updated source files. + url = "https://github.com/desktop-app/tg_owt/commit/2c0fbe4d3d1c33d0cc9ff7c112b4db1963bea535.patch"; + sha256 = "0apd6hfv3a1s3qy10kjwk4z8bg835cpk0ql9qxjnxf4gq183bhif"; + revert = true; + includes = [ "src/modules/desktop_capture/linux/shared_x_display.cc" ]; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf - xorg.libX11 libXtst + xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr + glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix index 920315bb1bc..3c890296fb1 100644 --- a/pkgs/development/libraries/libtgvoip/default.nix +++ b/pkgs/development/libraries/libtgvoip/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, autoreconfHook +{ stdenv, lib, fetchFromGitHub, fetchpatch +, pkg-config, autoreconfHook , openssl, libopus, alsaLib, libpulseaudio }: @@ -6,15 +7,31 @@ with lib; stdenv.mkDerivation rec { pname = "libtgvoip"; - version = "unstable-2020-03-02"; + version = "unstable-2021-01-01"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "libtgvoip"; - rev = "e422d2a80546a32ab7166a9b1058bacfc5daeefc"; - sha256 = "0n6f7215k74039j0zmicjzhj6f45mq6fvkrwzyzibcrv87ib17fc"; + rev = "13a5fcb16b04472d808ce122abd695dbf5d206cd"; + sha256 = "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd"; }; + # To fix the build without external webrtc: + patches = [ + (fetchpatch { + # Use methods from updated webrtc. + url = "https://github.com/telegramdesktop/libtgvoip/commit/13a5fcb16b04472d808ce122abd695dbf5d206cd.patch"; + sha256 = "0wapqvml3yyv5dlp2q8iih5rfvfnkngll69krhnw5xsdjy22sp7r"; + revert = true; + }) + (fetchpatch { + # Allow working with external webrtc. + url = "https://github.com/telegramdesktop/libtgvoip/commit/6e82b6e45664c1f80b9039256c99bebc76d34672.patch"; + sha256 = "0m87ixja70vnm80a9z4gxk0yl7n64y59smczxb88lxnj6kdgih7x"; + revert = true; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 1de73b5b66fde936450602e271c3c725933b7df4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Jun 2021 12:15:52 +0200 Subject: [PATCH 3/9] tdesktop: 2.8.0 -> 2.8.1 This also improves the packaging (see #128219). (cherry picked from commit dc87cf529880ec6ddbc4ac3011928fc28ef2ff58) --- .../telegram/tdesktop/default.nix | 13 +++++++----- .../telegram/tdesktop/tg_owt.nix | 20 +++++-------------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index b02a10aaa23..801b379fb1c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, callPackage +{ mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 @@ -23,12 +23,15 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.8.0"; + version = "2.8.1"; # Telegram-Desktop with submodules - src = fetchurl { - url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0689bmdpsj8qmv9ih6ckay23mivhlps8c081qljb8wqplmf2c4ds"; + src = fetchFromGitHub { + owner = "telegramdesktop"; + repo = "tdesktop"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1wf9806al6mzyd8nr37cdk6q2r354acixdqyjchi4r58drm99yv0"; }; postPatch = '' 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 eb2d3215349..d19c518373f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -3,32 +3,21 @@ , libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf , xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire +, libXi }: stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2021-06-17"; + version = "unstable-2021-06-27"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "f03ef05abf665437649a4f71886db1343590e862"; - sha256 = "0s6ajw52b95lcq4mn6lv8gj6lhv62bvwjh43w7az2k5pbm14v7vv"; + rev = "91d836dc84a16584c6ac52b36c04c0de504d9c34"; + sha256 = "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2"; fetchSubmodules = true; }; - patches = [ - # Our libXtst seems broken: - # /nix/store/rd3swxwmzjgjvwhz8svyc8ghc0brq293-libXtst-1.2.3/include/X11/extensions/XTest.h:32:10: fatal error: X11/extensions/XInput.h: No such file or directory - (fetchpatch { - # Copy updated source files. - url = "https://github.com/desktop-app/tg_owt/commit/2c0fbe4d3d1c33d0cc9ff7c112b4db1963bea535.patch"; - sha256 = "0apd6hfv3a1s3qy10kjwk4z8bg835cpk0ql9qxjnxf4gq183bhif"; - revert = true; - includes = [ "src/modules/desktop_capture/linux/shared_x_display.cc" ]; - }) - ]; - outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config cmake ninja yasm ]; @@ -37,6 +26,7 @@ stdenv.mkDerivation { libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire + libXi ]; cmakeFlags = [ From 11620afb1a8877fdf966d23b18daf9bc78d5e5d2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 26 Jun 2021 18:44:59 +0200 Subject: [PATCH 4/9] kotatogram-desktop: Copy the old tg_owt.nix from tdesktop The current tg_owt version (since the update of tdesktop to version 2.8.0 in 0d509d366d4) isn't compatible with kotatogram-desktop anymore. (cherry picked from commit f287805fafbf9f9b3ad024a35db6b81dad76f491) --- .../telegram/kotatogram-desktop/default.nix | 2 +- .../telegram/kotatogram-desktop/tg_owt.nix | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index c88c97705fd..8f941f2c5a3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -11,7 +11,7 @@ with lib; let - tg_owt = callPackage ../tdesktop/tg_owt.nix {}; + tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "kotatogram-desktop"; version = "1.4.1"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix new file mode 100644 index 00000000000..6bd72134e02 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm +, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf +, xorg, libXtst +}: + +let + rev = "2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3"; + sha256 = "0kz0i381iwsgcc3yzsq7njx3gkqja4bb9fsgc24vhg0md540qhyn"; + +in stdenv.mkDerivation { + pname = "tg_owt"; + version = "git-${rev}"; + + src = fetchFromGitHub { + owner = "desktop-app"; + repo = "tg_owt"; + inherit rev sha256; + fetchSubmodules = true; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkg-config cmake ninja yasm ]; + + buildInputs = [ + libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf + xorg.libX11 libXtst + ]; + + cmakeFlags = [ + # Building as a shared library isn't officially supported and currently broken: + "-DBUILD_SHARED_LIBS=OFF" + ]; + + meta.license = lib.licenses.bsd3; +} From 1d6b8ef74bf71873013212a07cc14668b56a81d1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 28 Jun 2021 13:29:37 +0200 Subject: [PATCH 5/9] tdesktop: 2.8.1 -> 2.8.3 (cherry picked from commit 3864c36b790f253e5109f833a788ece7e2dfbaa4) --- .../instant-messengers/telegram/tdesktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 801b379fb1c..8acc77ca743 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -23,7 +23,8 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.8.1"; + version = "2.8.3"; + # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules src = fetchFromGitHub { @@ -31,7 +32,7 @@ in mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1wf9806al6mzyd8nr37cdk6q2r354acixdqyjchi4r58drm99yv0"; + sha256 = "1ywxsy3a99sdibipriblbzskmkqbnxwrz3lavfdr134wq8w8rjf7"; }; postPatch = '' @@ -105,6 +106,7 @@ in mkDerivation rec { passthru = { inherit tg_owt; + updateScript = ./update.py; }; meta = { From 789b90fb348ad7cb778bbcc587e729da31bb5994 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 3 Jul 2021 16:47:01 +0300 Subject: [PATCH 6/9] tdesktop: 2.8.3 -> 2.8.4 (cherry picked from commit b7515545b5647ebdef27b52a5d4297b5336c53e7) --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 8acc77ca743..451b05c17bc 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -23,7 +23,7 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.8.3"; + version = "2.8.4"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -32,7 +32,7 @@ in mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1ywxsy3a99sdibipriblbzskmkqbnxwrz3lavfdr134wq8w8rjf7"; + sha256 = "sha256-IN3GQgdNM66/GxKa5EGKB/LIkgBxS8Y4mkPBaSEphmw="; }; postPatch = '' From 9b1bd6f7c74243211a3d2195688422a2fabea740 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Jul 2021 16:32:38 +0200 Subject: [PATCH 7/9] tdesktop: Drop the enchant2 and dee dependencies Ilya Fedin informed me that they aren't required anymore. Thanks :) (cherry picked from commit 733756ccfc2e333658f77c657a3cd1c64d2ff1eb) --- .../instant-messengers/telegram/tdesktop/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 451b05c17bc..e6e1851bffd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo -, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash -, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash +, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk , rnnoise, abseil-cpp, extra-cmake-modules # Transitive dependencies: @@ -36,8 +36,6 @@ in mkDerivation rec { }; postPatch = '' - substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ - --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' @@ -56,8 +54,8 @@ in mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash - dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash + ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk rnnoise abseil-cpp extra-cmake-modules tg_owt From b96fa3c4c1cc50ffc8f59b1d34acc1bdec19df5e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 18 Jul 2021 11:25:08 +0800 Subject: [PATCH 8/9] tdesktop: 2.8.4 -> 2.8.11 (cherry picked from commit e57ccfdaf3f95ba2c4fdb0a9e41799b8bd1fdfc1) --- .../telegram/tdesktop/default.nix | 18 +++++++++++++----- .../libraries/libtgvoip/default.nix | 6 +++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index e6e1851bffd..ad4fe5538d8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,8 +1,8 @@ -{ mkDerivation, lib, fetchFromGitHub, callPackage +{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash , ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 -, tl-expected, hunspell, glibmm, webkitgtk +, tl-expected, hunspell, glibmm, webkitgtk, jemalloc , rnnoise, abseil-cpp, extra-cmake-modules # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy @@ -23,7 +23,7 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.8.4"; + version = "2.8.11"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -32,9 +32,17 @@ in mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-IN3GQgdNM66/GxKa5EGKB/LIkgBxS8Y4mkPBaSEphmw="; + sha256 = "020ycgb77vx7rza590i3csrvq1zgm15rvpxqqcp0xkb4yh71i3hb"; }; + patches = [(fetchpatch { + # ref: https://github.com/desktop-app/lib_webview/pull/9 + url = "https://github.com/desktop-app/lib_webview/commit/75e924934eee8624020befbef1f3cb5b865d3b86.patch"; + sha256 = "sha256-rN4FVK4KT+xNf9IVdcpbxMqT0+t3SINJPRRQPyMiDP0="; + stripLen = 1; + extraPrefix = "Telegram/lib_webview/"; + })]; + postPatch = '' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' @@ -56,7 +64,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 - tl-expected hunspell glibmm webkitgtk + tl-expected hunspell glibmm webkitgtk jemalloc rnnoise abseil-cpp extra-cmake-modules tg_owt # Transitive dependencies: diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix index 3c890296fb1..4702c207657 100644 --- a/pkgs/development/libraries/libtgvoip/default.nix +++ b/pkgs/development/libraries/libtgvoip/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "libtgvoip"; - version = "unstable-2021-01-01"; + version = "unstable-2021-07-13"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "libtgvoip"; - rev = "13a5fcb16b04472d808ce122abd695dbf5d206cd"; - sha256 = "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd"; + rev = "f321e7c8cc086bac6ae06fa0934aac7d9833a310"; + sha256 = "1gk5nsqhbnn1cdh83b70qr3d3v2c1bncylvgn77vvj8vnyjlmnfq"; }; # To fix the build without external webrtc: From 29e7bc3d7d36f9de08128626b72fee6b014f7e09 Mon Sep 17 00:00:00 2001 From: cas1no <44465831+cas1no@users.noreply.github.com> Date: Sat, 31 Jul 2021 14:58:53 +0300 Subject: [PATCH 9/9] viber: add 'QML2_IMPORT_PATH' to the wrap (cherry picked from commit 3209d25fd2355dbb68bf231ee1c1b3b442d42e86) --- .../networking/instant-messengers/viber/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 7496063c58e..b355ba5428b 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -82,7 +82,8 @@ stdenv.mkDerivation { wrapProgram $out/opt/viber/Viber \ --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QML2_IMPORT_PATH "$out/opt/viber/qml" ln -s $out/opt/viber/Viber $out/bin/viber mv $out/usr/share $out/share