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 976eac59040e..87c70464e9b4 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,32 +1,28 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja -, qtbase, qtimageformats, enchant, xdg_utils, ffmpeg, openalSoft, lzma -, lz4, xxHash, zlib, minizip, openssl, libtgvoip, range-v3 +, qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg, openalSoft +, lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected +, range-v3 }: with lib; mkDerivation rec { pname = "kotatogram-desktop"; - version = "1.1.5"; + version = "1.2"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; rev = "k${version}"; - sha256 = "1j5wn3k1mr2c39szmyzm0pf720jmbllcaj40p2ydx0p3lir1s760"; + sha256 = "00pdx3cjhrihf7ihhmszcf159jrzn1bcx20vwiiizs5r1qk8l210"; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ - --replace '"libenchant-2.so.2"' '"${enchant}/lib/libenchant-2.so.2"' - ''; - nativeBuildInputs = [ pkg-config python3 cmake ninja ]; buildInputs = [ - qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash - zlib minizip openssl enchant libtgvoip range-v3 + qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu + zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ]; qtWrapperArgs = [ @@ -35,8 +31,8 @@ mkDerivation rec { cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" - "-DTDESKTOP_DISABLE_GTK_INTEGRATION=ON" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" + "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" ]; meta = { diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix index 4055aea5869e..920315bb1bc2 100644 --- a/pkgs/development/libraries/libtgvoip/default.nix +++ b/pkgs/development/libraries/libtgvoip/default.nix @@ -6,13 +6,13 @@ with lib; stdenv.mkDerivation rec { pname = "libtgvoip"; - version = "unstable-2020-01-21"; + version = "unstable-2020-03-02"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "libtgvoip"; - rev = "ade4434f1c6efabecc3b548ca1f692f8d103d22a"; - sha256 = "1bhnx3sknadx7a4qk9flh356kffb02xx32grj7cj7ik4rarccgp0"; + rev = "e422d2a80546a32ab7166a9b1058bacfc5daeefc"; + sha256 = "0n6f7215k74039j0zmicjzhj6f45mq6fvkrwzyzibcrv87ib17fc"; }; outputs = [ "out" "dev" ];