diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-11-09 07:09:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-09 07:09:34 +0100 |
| commit | 72450025dd351a185dddf4918e31143bcaf04515 (patch) | |
| tree | 90ee7713c201c712979873132f2a13111fc7b0c2 /pkgs/applications/networking/instant-messengers | |
| parent | e13c6645b16bcbacbf5ca09c10f4da643a0bab61 (diff) | |
| parent | 24b70b56a04ec3bac5b7571b37a6238fbc4a438a (diff) | |
| download | nixlib-72450025dd351a185dddf4918e31143bcaf04515.tar nixlib-72450025dd351a185dddf4918e31143bcaf04515.tar.gz nixlib-72450025dd351a185dddf4918e31143bcaf04515.tar.bz2 nixlib-72450025dd351a185dddf4918e31143bcaf04515.tar.lz nixlib-72450025dd351a185dddf4918e31143bcaf04515.tar.xz nixlib-72450025dd351a185dddf4918e31143bcaf04515.tar.zst nixlib-72450025dd351a185dddf4918e31143bcaf04515.zip | |
Merge pull request #30318 from peterhoeg/u/qtox
libmsgpack/libtoxcore/qtox: several related package upgrades
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/qtox/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/utox/default.nix | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index aee739256746..0bc3118d101b 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -2,25 +2,25 @@ libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver, qtbase, qtsvg, qttools, qttranslations, - ffmpeg, filter-audio, libsodium, libopus, + ffmpeg, filter-audio, libexif, libsodium, libopus, libvpx, openal, opencv, pcre, qrencode, sqlcipher }: mkDerivation rec { name = "qtox-${version}"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { - owner = "tux3"; + owner = "qTox"; repo = "qTox"; rev = "v${version}"; - sha256 = "0h8v359h1xn2xm6xa9q56mjiw58ap1bpiwx1dxxmphjildxadwck"; + sha256 = "1832ay0167qjc2vvpps507mnb0531y3d3pxmlm5nakvcwjs7vl8d"; }; buildInputs = [ libtoxcore libpthreadstubs libXdmcp libXScrnSaver qtbase qtsvg qttools qttranslations - ffmpeg filter-audio libopus libsodium + ffmpeg filter-audio libexif libopus libsodium libvpx openal opencv pcre qrencode sqlcipher ]; @@ -37,6 +37,7 @@ mkDerivation rec { meta = with lib; { description = "Qt Tox client"; + homepage = https://tox.chat; license = licenses.gpl3; maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 9c4d88761b87..9c208dd52a83 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_UPDATER=OFF" - ]; + ] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; - doCheck = false; + doCheck = true; checkTarget = "test"; |