public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tdesktop: 1.9.9 -> 1.9.12

Browse Source 
Note: I skipped the packaging of mapbox-variant for now.
This commit is contained in:
Michael Weiss 2020-02-11 21:41:25 +01:00
parent 818628c53a
commit d0729f8323
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -1,7 +1,8 @@
{ mkDerivation, lib, fetchurl, fetchsvn { mkDerivation, lib, fetchurl, fetchsvn
, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , 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 , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
, tl-expected, microsoft_gsl
# TODO: Shouldn't be required: # TODO: Shouldn't be required:
, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
, xdg_utils , xdg_utils
@ -18,17 +19,15 @@ with lib;
mkDerivation rec { mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "1.9.9"; version = "1.9.12";
# Telegram-Desktop with submodules # Telegram-Desktop with submodules
src = fetchurl { src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
sha256 = "08bxlqiapj9yqj9ywni33n5k7n3ckgfhv200snjqyqy9waqph1i6"; sha256 = "1xjf2fh6qry4q6frq2ixmn1k0rsc72h4j0zmahfsggyl3j5mgkx1";
}; };
postPatch = '' 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 \ substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \
--replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"'
substituteInPlace Telegram/CMakeLists.txt \ substituteInPlace Telegram/CMakeLists.txt \
@ -42,8 +41,9 @@ mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook ]; nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook ];
buildInputs = [ 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 dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3
tl-expected microsoft_gsl
# TODO: Shouldn't be required: # TODO: Shouldn't be required:
pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst 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_GLIBC_WRAPS=OFF"
"-DDESKTOP_APP_USE_PACKAGED=ON" "-DDESKTOP_APP_USE_PACKAGED=ON"
"-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"
"-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF"
"-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON"
"-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON"
"-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON" "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON"
@ -80,6 +81,7 @@ mkDerivation rec {
# - upstream: https://github.com/grishka/libtgvoip # - upstream: https://github.com/grishka/libtgvoip
# Both of these packages are included in this PR (kotatogram-desktop): # Both of these packages are included in this PR (kotatogram-desktop):
# https://github.com/NixOS/nixpkgs/pull/75210 # https://github.com/NixOS/nixpkgs/pull/75210
# TODO: Package mapbox-variant
postFixup = '' postFixup = ''
# This is necessary to run Telegram in a pure environment. # This is necessary to run Telegram in a pure environment.