diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-02-12 20:08:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-12 20:08:23 +0100 |
commit | fc3f421cff5c2c7252dbf69b79ab6057893337a1 (patch) | |
tree | 668f5f427a0ad98e23220cea0e08b9dbc0c57291 /pkgs/applications | |
parent | ac758caff10e98790d5f9df298d0172099268077 (diff) | |
parent | d0729f83230e551e2c094d98bcc3919a2d331c0a (diff) | |
download | nixpkgs-fc3f421cff5c2c7252dbf69b79ab6057893337a1.tar nixpkgs-fc3f421cff5c2c7252dbf69b79ab6057893337a1.tar.gz nixpkgs-fc3f421cff5c2c7252dbf69b79ab6057893337a1.tar.bz2 nixpkgs-fc3f421cff5c2c7252dbf69b79ab6057893337a1.tar.lz nixpkgs-fc3f421cff5c2c7252dbf69b79ab6057893337a1.tar.xz nixpkgs-fc3f421cff5c2c7252dbf69b79ab6057893337a1.tar.zst nixpkgs-fc3f421cff5c2c7252dbf69b79ab6057893337a1.zip |
Merge pull request #79867 from primeos/tdesktop
tdesktop: 1.9.9 -> 1.9.12
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 14 |
1 files changed, 8 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 f4ade076726..05dbfbdaf96 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, fetchurl, fetchsvn , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook -, qtbase, qtimageformats, gtk3, libappindicator-gtk3, enchant2, lz4, xxHash +, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, tl-expected, microsoft_gsl # TODO: Shouldn't be required: , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , xdg_utils @@ -18,17 +19,15 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.9.9"; + version = "1.9.12"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "08bxlqiapj9yqj9ywni33n5k7n3ckgfhv200snjqyqy9waqph1i6"; + sha256 = "1xjf2fh6qry4q6frq2ixmn1k0rsc72h4j0zmahfsggyl3j5mgkx1"; }; postPatch = '' - substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ - --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' 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 \ @@ -42,8 +41,9 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook ]; buildInputs = [ - qtbase qtimageformats gtk3 libappindicator-gtk3 enchant2 lz4 xxHash + qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 + tl-expected microsoft_gsl # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst ]; @@ -58,6 +58,7 @@ mkDerivation rec { "-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF" "-DDESKTOP_APP_USE_PACKAGED=ON" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" + "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON" @@ -80,6 +81,7 @@ mkDerivation rec { # - upstream: https://github.com/grishka/libtgvoip # Both of these packages are included in this PR (kotatogram-desktop): # https://github.com/NixOS/nixpkgs/pull/75210 + # TODO: Package mapbox-variant postFixup = '' # This is necessary to run Telegram in a pure environment. |