diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 20:45:45 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-20 07:56:49 -0600 |
commit | de5898a49585fd2a4f57c0263377400b180d2641 (patch) | |
tree | bbcdd41fe985b47dd058c08b76d27e8e8bffc3e6 /pkgs/applications/networking/instant-messengers/qtox | |
parent | 249e5f732afd9afa5fbdc6e3ec99cfc5e4eb5014 (diff) |
qtox: Qt 5 infrastructure update
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/qtox')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/qtox/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 170702e44d13a..0a7b44ba8cbce 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchgit, pkgconfig, libtoxcore-dev, qt5, openal, opencv, +{ stdenv, fetchgit, pkgconfig, libtoxcore-dev, openal, opencv, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, - pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }: + pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper, + qtbase, qtsvg, qttools, qttranslations }: let revision = "1673b43e26c853f6446f228fec083af166cbf446"; @@ -18,8 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore-dev openal opencv libsodium filter-audio - qt5.base qt5.tools libXScrnSaver glib gtk2 cairo - pango atk qrencode ffmpeg qt5.translations makeWrapper + qtbase qttools libXScrnSaver glib gtk2 cairo + pango atk qrencode ffmpeg qttranslations makeWrapper ]; nativeBuildInputs = [ pkgconfig ]; @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp qtox $out/bin wrapProgram $out/bin/qtox \ - --prefix QT_PLUGIN_PATH : ${qt5.svg}/lib/qt5/plugins + --prefix QT_PLUGIN_PATH : ${qtsvg}/lib/qt5/plugins ''; enableParallelBuilding = true; |