diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 5c8a03eb8ef..170702e44d1 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -2,13 +2,17 @@ libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }: +let + revision = "1673b43e26c853f6446f228fec083af166cbf446"; +in + stdenv.mkDerivation rec { - name = "qtox-dev-20150821"; + name = "qtox-dev-20150925"; src = fetchgit { url = "https://github.com/tux3/qTox.git"; - rev = "2f6b5e052f2a625d506e83f880c5d68b49118f95"; - md5 = "b2f9cf283136b6e558876ca2e6d128a3"; + rev = "${revision}"; + md5 = "785f5b305cdcdf777d93ee823a5b9f49"; }; buildInputs = @@ -21,6 +25,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; preConfigure = '' + # patch .pro file for proper set of the git hash + sed -i '/git rev-parse/d' qtox.pro + sed -i 's/$$quote($$GIT_VERSION)/${revision}/' qtox.pro + # since .pro have hardcoded paths, we need to explicitly set paths here export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags glib-2.0)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gdk-pixbuf-2.0)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)" @@ -44,9 +52,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "QT Tox client"; + description = "Qt Tox client"; license = licenses.gpl3; - maintainers = with maintainers; [ viric jgeerds ]; + maintainers = with maintainers; [ viric jgeerds akaWolf ]; platforms = platforms.all; }; }