diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-22 00:32:46 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-22 00:32:46 +0100 |
| commit | 3e6c5a25f38697c088a1ab38a12ab81f21f3849e (patch) | |
| tree | f46b38a83da6904c0daa4d4f9de66b6dd1f629c8 /pkgs/applications/networking | |
| parent | 09cc8872ef8b362187ffdef1eaabf71c7f7265ab (diff) | |
| parent | 4f79874f5708b16dbf03b80af5f47fd61c9d116d (diff) | |
| download | nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.gz nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.bz2 nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.lz nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.xz nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.zst nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.zip | |
Merge branch 'staging'
In particular, this upgrades the default gcc: 6 -> 7. Fixes #27794, /cc #31747.
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c4158d280e2b..34f0d16a7b43 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchgit, fetchpatch -, pkgconfig, gyp, cmake, gcc7, makeWrapper +, pkgconfig, gyp, cmake, makeWrapper , qtbase, qtimageformats, gtk3, libappindicator-gtk3 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: @@ -31,7 +31,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig gyp cmake gcc7 makeWrapper ]; + nativeBuildInputs = [ pkgconfig gyp cmake makeWrapper ]; buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 |