Merge pull request #9388 from akaWolf/qtox

qtox updated
This commit is contained in:
Jascha Geerds 2015-08-22 11:14:39 +02:00
commit a1d85fc261

View file

@ -1,21 +1,21 @@
{ stdenv, fetchgit, pkgconfig, libtoxcore-dev, qt5, openal, opencv,
libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
pango, atk, qrencode, ffmpeg, filter-audio }:
pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }:
stdenv.mkDerivation rec {
name = "qtox-dev-20150624";
name = "qtox-dev-20150821";
src = fetchgit {
url = "https://github.com/tux3/qTox.git";
rev = "9f386135a2cf428d2802b158c70be4beee5abf86";
sha256 = "1m2y50q5yim1q75k48cy5daq5qm77cvb3kcla7lpqv54xnfdwxk8";
rev = "2f6b5e052f2a625d506e83f880c5d68b49118f95";
md5 = "b2f9cf283136b6e558876ca2e6d128a3";
};
buildInputs =
[
libtoxcore-dev openal opencv libsodium filter-audio
qt5.base qt5.tools libXScrnSaver glib gtk2 cairo
pango atk qrencode ffmpeg qt5.translations
pango atk qrencode ffmpeg qt5.translations makeWrapper
];
nativeBuildInputs = [ pkgconfig ];
@ -37,8 +37,12 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp qtox $out/bin
wrapProgram $out/bin/qtox \
--prefix QT_PLUGIN_PATH : ${qt5.svg}/lib/qt5/plugins
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "QT Tox client";
license = licenses.gpl3;
@ -46,4 +50,3 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
};
}