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

tdesktop: 2.8.0 -> 2.8.1 

This also improves the packaging (see #128219).

(cherry picked from commit dc87cf529880ec6ddbc4ac3011928fc28ef2ff58)
This commit is contained in:
Michael Weiss 2021-06-27 12:15:52 +02:00 committed by Yureka
parent d73ddfe782
commit 1de73b5b66
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, callPackage { mkDerivation, lib, fetchFromGitHub, callPackage
, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
@ -23,12 +23,15 @@ let
tg_owt = callPackage ./tg_owt.nix {}; tg_owt = callPackage ./tg_owt.nix {};
in mkDerivation rec { in mkDerivation rec {
pname = "telegram-desktop"; pname = "telegram-desktop";
version = "2.8.0"; version = "2.8.1";
# Telegram-Desktop with submodules # Telegram-Desktop with submodules
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; owner = "telegramdesktop";
sha256 = "0689bmdpsj8qmv9ih6ckay23mivhlps8c081qljb8wqplmf2c4ds"; repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "1wf9806al6mzyd8nr37cdk6q2r354acixdqyjchi4r58drm99yv0";
}; };
postPatch = '' postPatch = ''

20
pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
View File

@ -3,32 +3,21 @@
, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf , libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf
, xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr , xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr
, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire
, libXi
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "tg_owt"; pname = "tg_owt";
version = "unstable-2021-06-17"; version = "unstable-2021-06-27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "desktop-app"; owner = "desktop-app";
repo = "tg_owt"; repo = "tg_owt";
rev = "f03ef05abf665437649a4f71886db1343590e862"; rev = "91d836dc84a16584c6ac52b36c04c0de504d9c34";
sha256 = "0s6ajw52b95lcq4mn6lv8gj6lhv62bvwjh43w7az2k5pbm14v7vv"; sha256 = "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
# Our libXtst seems broken:
# /nix/store/rd3swxwmzjgjvwhz8svyc8ghc0brq293-libXtst-1.2.3/include/X11/extensions/XTest.h:32:10: fatal error: X11/extensions/XInput.h: No such file or directory
(fetchpatch {
# Copy updated source files.
url = "https://github.com/desktop-app/tg_owt/commit/2c0fbe4d3d1c33d0cc9ff7c112b4db1963bea535.patch";
sha256 = "0apd6hfv3a1s3qy10kjwk4z8bg835cpk0ql9qxjnxf4gq183bhif";
revert = true;
includes = [ "src/modules/desktop_capture/linux/shared_x_display.cc" ];
})
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config cmake ninja yasm ]; nativeBuildInputs = [ pkg-config cmake ninja yasm ];
@ -37,6 +26,7 @@ stdenv.mkDerivation {
libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf
xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr
glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire
libXi
]; ];
cmakeFlags = [ cmakeFlags = [