diff options
| author | Alexey Shmalko <rasen.dubi@gmail.com> | 2020-04-12 15:02:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 15:02:41 +0300 |
| commit | 5eca80f7ebd74f3b194631c334dbc10775efb5db (patch) | |
| tree | 61ef2ca32dfb34def0c305d05ec7e44d582fb06a /pkgs/applications/networking/instant-messengers/telegram | |
| parent | 81a6a80436e5e2f6746e8029363521696bc32626 (diff) | |
| parent | 4d5326e4fd4d24b901f8ec4f0f2d22400840686f (diff) | |
| download | nixlib-5eca80f7ebd74f3b194631c334dbc10775efb5db.tar nixlib-5eca80f7ebd74f3b194631c334dbc10775efb5db.tar.gz nixlib-5eca80f7ebd74f3b194631c334dbc10775efb5db.tar.bz2 nixlib-5eca80f7ebd74f3b194631c334dbc10775efb5db.tar.lz nixlib-5eca80f7ebd74f3b194631c334dbc10775efb5db.tar.xz nixlib-5eca80f7ebd74f3b194631c334dbc10775efb5db.tar.zst nixlib-5eca80f7ebd74f3b194631c334dbc10775efb5db.zip | |
Merge pull request #82883 from ilya-fedin/update-kotatogram
kotatogram-desktop: 1.1.5 -> 1.2
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix | 20 |
1 files changed, 8 insertions, 12 deletions
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 = { |