BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tdesktop: Cleanup/refactor

Browse source 
Drop old/outdated comments and some reordering for consistency.
This commit is contained in:
Michael Weiss 2021-07-23 13:27:41 +02:00
parent dcc6c7dfb1
commit f6c5598f54
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
3 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file

@ -1,11 +1,13 @@
{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
, extra-cmake-modules
, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk, jemalloc
, rnnoise, extra-cmake-modules
, rnnoise
# Transitive dependencies:
, pcre, xorg, util-linuxMinimal, libselinux, libsepol, epoxy
, util-linuxMinimal
, pcre, libpthreadstubs, libXdmcp, libselinux, libsepol, epoxy
, at-spi2-core, libXtst, libthai, libdatrie
, xdg-utils, libsysprof-capture, libpsl, brotli
}:
@ -72,7 +74,7 @@ in mkDerivation rec {
tg_owt
# Transitive dependencies:
util-linuxMinimal # Required for libmount thus not nativeBuildInputs.
pcre xorg.libpthreadstubs xorg.libXdmcp libselinux libsepol epoxy
pcre libpthreadstubs libXdmcp libselinux libsepol epoxy
at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli
];
@ -85,20 +87,6 @@ in mkDerivation rec {
"-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
];
# Note: The following packages could be packaged system-wide, but it's
# probably best to use the bundled ones from tdesktop (Arch does this too):
# rlottie:
# - Sources (problem: there are no stable releases!):
# - desktop-app (tdesktop): https://github.com/desktop-app/rlottie
# - upstream: https://github.com/Samsung/rlottie
# libtgvoip:
# - Sources (problem: the stable releases might be too old!):
# - tdesktop: https://github.com/telegramdesktop/libtgvoip
# - 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.
# We also use gappsWrapperArgs from wrapGAppsHook.

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View file

@ -1,9 +1,9 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
{ lib, stdenv, fetchFromGitHub
, pkg-config, cmake, ninja, yasm
, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
, openh264, usrsctp, libevent, libvpx
, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
, xorg, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
}:
stdenv.mkDerivation {

4
pkgs/top-level/all-packages.nix
View file

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