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

tdesktop: 1.0.27 -> 1.1.7

This commit is contained in:
David Izquierdo 2017-06-17 23:24:30 +02:00
parent b1f76ebb73
commit aa2b643e4b
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,33 +1,35 @@
{ mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake { mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
, qtbase, qtimageformats , qtbase, qtimageformats
, breakpad, gtk3, libappindicator-gtk3, dee , breakpad, gtk3, libappindicator-gtk3, dee
, ffmpeg, openalSoft, minizip , ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio
, gcc
}: }:
mkDerivation rec { mkDerivation rec {
name = "telegram-desktop-${version}"; name = "telegram-desktop-${version}";
version = "1.0.27"; version = "1.1.7";
# Submodules # Submodules
src = fetchgit { src = fetchgit {
url = "https://github.com/telegramdesktop/tdesktop"; url = "https://github.com/telegramdesktop/tdesktop";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "05g88g6h2a7f9biliicg81fqssx0y3akd3y5r2q2b5h8q3igqrfc"; sha256 = "0y0nc8d4vlhsmzayy26zdxc5jaiwcv0rb2s1v5fwnnx71gf89m2w";
}; };
tgaur = fetchgit { tgaur = fetchgit {
url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
rev = "b4d169076ed12ec01941a95499774d5caa6fc00e"; rev = "83af81905de7fc5dc9fbea8f5318d56fa8a6efc6";
sha256 = "0pmm6slabg9xazgs0ffnp8v0hx3vnpdfgymvapwqpm3h9mwk22x9"; sha256 = "0v7g7y5cmxzp2yrcj6ylwzxlzr9yrqs2badzplm7sg012nc69yf9";
}; };
buildInputs = [ buildInputs = [
gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip
libopus alsaLib libpulseaudio
]; ];
nativeBuildInputs = [ pkgconfig gyp cmake ]; nativeBuildInputs = [ pkgconfig gyp cmake gcc ];
patches = [ "${tgaur}/aur-build-fixes.patch" ]; patches = [ "${tgaur}/tdesktop.patch" ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -48,10 +50,18 @@ mkDerivation rec {
"-I${qtbase.dev}/include/${x}" "-I${qtbase.dev}/include/${x}"
"-I${qtbase.dev}/include/${x}/${qtbase.version}" "-I${qtbase.dev}/include/${x}/${qtbase.version}"
"-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}" "-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}"
"-I${libopus.dev}/include/opus"
"-I${alsaLib.dev}/include/alsa"
"-I${libpulseaudio.dev}/include/pulse"
]) [ "QtCore" "QtGui" ]; ]) [ "QtCore" "QtGui" ];
CPPFLAGS = NIX_CFLAGS_COMPILE; CPPFLAGS = NIX_CFLAGS_COMPILE;
preConfigure = '' preConfigure = ''
pushd "Telegram/ThirdParty/libtgvoip"
patch -Np1 -i "${tgaur}/libtgvoip.patch"
popd
sed -i Telegram/gyp/telegram_linux.gypi \ sed -i Telegram/gyp/telegram_linux.gypi \
-e 's,/usr,/does-not-exist,g' \ -e 's,/usr,/does-not-exist,g' \
-e 's,appindicator-0.1,appindicator3-0.1,g' \ -e 's,appindicator-0.1,appindicator3-0.1,g' \
@ -63,6 +73,7 @@ mkDerivation rec {
-e "s,/usr/bin/rcc,rcc,g" -e "s,/usr/bin/rcc,rcc,g"
gyp \ gyp \
-Dbuild_defines=${GYP_DEFINES} \
-Gconfig=Release \ -Gconfig=Release \
--depth=Telegram/gyp \ --depth=Telegram/gyp \
--generator-output=../.. \ --generator-output=../.. \

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

@ -16024,6 +16024,7 @@ with pkgs;
tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
inherit (pythonPackages) gyp; inherit (pythonPackages) gyp;
gcc = gcc6;
}; };
telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { };