Merge pull request #131459 from primeos/tdesktop
tdesktop: Cleanup/refactor
This commit is contained in:
commit
788a365c7a
|
@ -1,11 +1,13 @@
|
||||||
{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch
|
{ mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch
|
||||||
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
|
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
|
||||||
|
, extra-cmake-modules
|
||||||
, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash
|
, qtbase, qtimageformats, gtk3, libsForQt5, 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, extra-cmake-modules
|
, rnnoise
|
||||||
# Transitive dependencies:
|
# Transitive dependencies:
|
||||||
, pcre, xorg, util-linuxMinimal, libselinux, libsepol, epoxy
|
, util-linuxMinimal
|
||||||
|
, pcre, libpthreadstubs, libXdmcp, libselinux, libsepol, epoxy
|
||||||
, at-spi2-core, libXtst, libthai, libdatrie
|
, at-spi2-core, libXtst, libthai, libdatrie
|
||||||
, xdg-utils, libsysprof-capture, libpsl, brotli
|
, xdg-utils, libsysprof-capture, libpsl, brotli
|
||||||
}:
|
}:
|
||||||
|
@ -72,7 +74,7 @@ in mkDerivation rec {
|
||||||
tg_owt
|
tg_owt
|
||||||
# Transitive dependencies:
|
# Transitive dependencies:
|
||||||
util-linuxMinimal # Required for libmount thus not nativeBuildInputs.
|
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
|
at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -85,20 +87,6 @@ in mkDerivation rec {
|
||||||
"-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF"
|
"-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 = ''
|
postFixup = ''
|
||||||
# This is necessary to run Telegram in a pure environment.
|
# This is necessary to run Telegram in a pure environment.
|
||||||
# We also use gappsWrapperArgs from wrapGAppsHook.
|
# We also use gappsWrapperArgs from wrapGAppsHook.
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
{ lib, stdenv, fetchFromGitHub
|
||||||
, pkg-config, cmake, ninja, yasm
|
, pkg-config, cmake, ninja, yasm
|
||||||
, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
|
, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf
|
||||||
, openh264, usrsctp, libevent, libvpx
|
, openh264, usrsctp, libevent, libvpx
|
||||||
|
, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
|
||||||
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
|
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
|
||||||
, xorg, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
|
|
@ -27340,7 +27340,9 @@ in
|
||||||
|
|
||||||
taskopen = callPackage ../applications/misc/taskopen { };
|
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 { };
|
tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue