diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2018-01-21 15:42:08 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2018-01-21 15:42:08 +0100 |
| commit | d1a04efbf7dc593903355e64e8b52cc5a6d00551 (patch) | |
| tree | ee65822e786a4311e780e644efabf4d40fb3db63 | |
| parent | 94276da9e98691be7d083b06301c3e434ba2cfa4 (diff) | |
| download | nixpkgs-d1a04efbf7dc593903355e64e8b52cc5a6d00551.tar nixpkgs-d1a04efbf7dc593903355e64e8b52cc5a6d00551.tar.gz nixpkgs-d1a04efbf7dc593903355e64e8b52cc5a6d00551.tar.bz2 nixpkgs-d1a04efbf7dc593903355e64e8b52cc5a6d00551.tar.lz nixpkgs-d1a04efbf7dc593903355e64e8b52cc5a6d00551.tar.xz nixpkgs-d1a04efbf7dc593903355e64e8b52cc5a6d00551.tar.zst nixpkgs-d1a04efbf7dc593903355e64e8b52cc5a6d00551.zip | |
tdesktop: 1.1.23 -> 1.2.1
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 3f438c62508..608d006ab3e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,34 +1,33 @@ -{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake +{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake, gcc7 , qtbase, qtimageformats , gtk3, libappindicator-gtk3, dee -, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio -, gcc +, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.1.23"; + version = "1.2.1"; # Submodules src = fetchgit { url = "git://github.com/telegramdesktop/tdesktop"; rev = "v${version}"; - sha256 = "0pdjrypjg015zvg8iydrja8kzvq0jsi1wz77r2cxvyyb4rkgyv7x"; + sha256 = "1wgcwm9lcy9zw7jawsjj4c46p9mky611k6gjw1900llwxkfh4fh5"; fetchSubmodules = true; }; tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; - rev = "885d0594d8dfa0a17c14140579a3d27ef2b9bdd0"; - sha256 = "0cdci8d8j3czhznp7gqn16w32j428njmzxr34pdsv40gggh0lbpn"; + rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e"; + sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc"; }; buildInputs = [ gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip - libopus alsaLib libpulseaudio + libopus alsaLib libpulseaudio range-v3 ]; - nativeBuildInputs = [ pkgconfig gyp cmake gcc ]; + nativeBuildInputs = [ pkgconfig gyp cmake gcc7 ]; patches = [ "${tgaur}/tdesktop.patch" ]; @@ -54,7 +53,7 @@ mkDerivation rec { "-I${libopus.dev}/include/opus" "-I${alsaLib.dev}/include/alsa" "-I${libpulseaudio.dev}/include/pulse" - ]) [ "QtCore" "QtGui" ]; + ]) [ "QtCore" "QtGui" "QtDBus" ]; CPPFLAGS = NIX_CFLAGS_COMPILE; preConfigure = '' @@ -69,6 +68,9 @@ mkDerivation rec { -e 's,-flto,,g' sed -i Telegram/gyp/qt.gypi \ + -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \ + -e 's,\d+",\d+" | head -n1,g' + sed -i Telegram/gyp/qt_moc.gypi \ -e "s,/usr/bin/moc,moc,g" sed -i Telegram/gyp/qt_rcc.gypi \ -e "s,/usr/bin/rcc,rcc,g" |