dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

tdesktop: fix qt5 selection, cleanup

Browse Source
This commit is contained in:
Sandro Jäckel 2021-08-06 09:11:37 +02:00
parent 143fe598ba
commit 6d0da63aec
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ mkDerivation, lib, fetchFromGitHub, callPackage { mkDerivation, lib, fetchFromGitHub, callPackage
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, extra-cmake-modules , 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 , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk, jemalloc , tl-expected, hunspell, glibmm, webkitgtk, jemalloc
, rnnoise , rnnoise
@ -12,8 +12,6 @@
, xdg-utils, libsysprof-capture, libpsl, brotli , xdg-utils, libsysprof-capture, libpsl, brotli
}: }:
with lib;
# Main reference: # Main reference:
# - This package was originally based on the Arch package but all patches are now upstreamed: # - 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 # https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop
@ -59,7 +57,7 @@ in mkDerivation rec {
]; ];
buildInputs = [ 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 ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3
tl-expected hunspell glibmm webkitgtk jemalloc tl-expected hunspell glibmm webkitgtk jemalloc
rnnoise rnnoise
@ -85,7 +83,7 @@ in mkDerivation rec {
wrapProgram $out/bin/telegram-desktop \ wrapProgram $out/bin/telegram-desktop \
"''${gappsWrapperArgs[@]}" \ "''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \
--prefix PATH : ${xdg-utils}/bin \ --prefix PATH : ${lib.makeBinPath [ xdg-utils]} \
--set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
sed -i $out/bin/telegram-desktop \ sed -i $out/bin/telegram-desktop \
-e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
@ -96,7 +94,7 @@ in mkDerivation rec {
updateScript = ./update.py; updateScript = ./update.py;
}; };
meta = { meta = with lib; {
description = "Telegram Desktop messaging app"; description = "Telegram Desktop messaging app";
longDescription = '' longDescription = ''
Desktop client for the Telegram messenger, based on the Telegram API and Desktop client for the Telegram messenger, based on the Telegram API and

2
pkgs/top-level/all-packages.nix
View File

@ -27543,7 +27543,7 @@ in
taskopen = callPackage ../applications/misc/taskopen { }; taskopen = callPackage ../applications/misc/taskopen { };
tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { tdesktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
inherit (xorg) libpthreadstubs libXdmcp; inherit (xorg) libpthreadstubs libXdmcp;
}; };