diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-08-06 09:11:37 +0200 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-08-06 09:11:37 +0200 |
commit | 6d0da63aecb701cead9322806550e44a4f82c760 (patch) | |
tree | e69599e66a6f26bdf7efb3fc5be56c774a90bc41 /pkgs/applications/networking/instant-messengers/telegram | |
parent | 143fe598ba755c98959c3d586ee56595a8acf7c1 (diff) |
tdesktop: fix qt5 selection, cleanup
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telegram')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 10 |
1 files 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 972fb1eab2798..8478b590084ae 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 , extra-cmake-modules -, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash +, qtbase, qtimageformats, gtk3, kwayland, libdbusmenu, lz4, xxHash , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk, jemalloc , rnnoise @@ -12,8 +12,6 @@ , xdg-utils, libsysprof-capture, libpsl, brotli }: -with lib; - # Main reference: # - This package was originally based on the Arch package but all patches are now upstreamed: # https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop @@ -59,7 +57,7 @@ in mkDerivation rec { ]; buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash + qtbase qtimageformats gtk3 kwayland libdbusmenu lz4 xxHash ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk jemalloc rnnoise @@ -85,7 +83,7 @@ in mkDerivation rec { wrapProgram $out/bin/telegram-desktop \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ - --prefix PATH : ${xdg-utils}/bin \ + --prefix PATH : ${lib.makeBinPath [ xdg-utils]} \ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," @@ -96,7 +94,7 @@ in mkDerivation rec { updateScript = ./update.py; }; - meta = { + meta = with lib; { description = "Telegram Desktop messaging app"; longDescription = '' Desktop client for the Telegram messenger, based on the Telegram API and |