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

tdesktop: 0.10.19 -> 1.0.0

Browse Source 
abbradar: add vdpau to fix the build, use qt56 explicitly

Closes #21821.
This commit is contained in:
Ignat Loskutov 2017-01-12 03:12:25 +03:00 committed by Nikolay Amiantov
parent 60435691f7
commit c94c2666bb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
, breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus
, gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2
, libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland
, xcbutilrenderutil, icu, libSM, libICE, libproxy
, xcbutilrenderutil, icu, libSM, libICE, libproxy, libvdpau
, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon
, libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11
@ -19,20 +19,20 @@ let
in stdenv.mkDerivation rec {
name = "telegram-desktop-${version}";
version = "0.10.19";
version = "1.0.0";
qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
sha256 = "1p07kxfmcd90sx9bq046x03h1h807vs0pn64lfghr6m6ln8z44s3";
sha256 = "1qxzi82cgd8klk6rn83rzrmik0s76alarfaknknww5iw5px7gi8b";
};
tgaur = fetchgit {
url = "https://aur.archlinux.org/telegram-desktop.git";
rev = "99bb0519f14e23fafb6884fe296d34b6f8bed5c3";
sha256 = "0z5m3binbl06kk34plmfblhqz6hlnkbnjb93sam0c6c995k3sz82";
rev = "957a76f9fb691486341bcf4781ad0ef3d16f6b69";
sha256 = "01nrvvq0mrdyvamjgqr4z5aahyd1wrf28jyddpfsnixp2w5kxqj8";
};
buildInputs = [
@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
# Qt dependencies
libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon
libpng libjpeg freetype harfbuzz pcre16 xproto libX11
inputproto sqlite dbus libwebp wayland
inputproto sqlite dbus libwebp wayland libvdpau
];
nativeBuildInputs = [ pkgconfig gyp cmake ];

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

@ -15108,7 +15108,7 @@ in
taskserver = callPackage ../servers/misc/taskserver { };
tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
tdesktop = qt56.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
inherit (pythonPackages) gyp;
};