diff options
3 files changed, 23 insertions, 19 deletions
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 0a7b44ba8cb..72619e417ad 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,26 +1,27 @@ { stdenv, fetchgit, pkgconfig, libtoxcore-dev, openal, opencv, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper, - qtbase, qtsvg, qttools, qttranslations }: + qtbase, qtsvg, qttools, qttranslations, sqlcipher }: let - revision = "1673b43e26c853f6446f228fec083af166cbf446"; + revision = "8b671916abdcc1d553a367a502b23ec4ea7568a1"; in stdenv.mkDerivation rec { - name = "qtox-dev-20150925"; + name = "qtox-dev-20151221"; src = fetchgit { url = "https://github.com/tux3/qTox.git"; rev = "${revision}"; - md5 = "785f5b305cdcdf777d93ee823a5b9f49"; + md5 = "a93a63d35e506be4b21abda0986f19e7"; }; buildInputs = [ libtoxcore-dev openal opencv libsodium filter-audio - qtbase qttools libXScrnSaver glib gtk2 cairo + qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo pango atk qrencode ffmpeg qttranslations makeWrapper + sqlcipher ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 17a7f11ccce..61b7e8ec510 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,35 +1,38 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft }: +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, dbus, libvpx, libX11, openal, freetype, libv4l +, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }: let filteraudio = stdenv.mkDerivation rec { - name = "filter_audio-20150128"; + name = "filter_audio-20150516"; src = fetchFromGitHub { owner = "irungentoo"; repo = "filter_audio"; - rev = "76428a6cda"; - sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9"; + rev = "612c5a102550c614e4c8f859e753ea64c0b7250c"; + sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na"; }; + buildInputs = [ utillinux ]; + doCheck = false; makeFlags = "PREFIX=$(out)"; }; in stdenv.mkDerivation rec { - name = "utox-dev-20150130"; + name = "utox-dev-20151220"; src = fetchFromGitHub { - owner = "notsecure"; + owner = "GrayHatter"; repo = "uTox"; - rev = "cb7b8d09b08"; - sha256 = "0vg9h07ipwyf7p54p43z9bcymy0skiyjbm7zvyjg7r5cvqxv1vpa"; + rev = "7e2907470835746b6819d631b48dd54bc9c4de66"; + sha256 = "074wa0np8hyqwy9xqgyyds94pdfv2i1jh019m98d8apxc5vn36wk"; }; - buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype - libv4l libXrender fontconfig libXext libXft filteraudio ]; + buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype + libv4l libXrender fontconfig libXext libXft filteraudio + git libsodium ]; doCheck = false; diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix index 42f81cf6a9d..b0e3a09c0b4 100644 --- a/pkgs/development/libraries/libtoxcore/new-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix @@ -2,13 +2,13 @@ , libvpx, check, libconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "tox-core-dev-20150629"; + name = "tox-core-dev-20160105"; src = fetchFromGitHub { owner = "irungentoo"; repo = "toxcore"; - rev = "219fabc0f5dbaac7968cb7728d25dface3ebb2ea"; - sha256 = "1rsnxa5b7i2zclx0kzbf4a5mds0jfkvfjz1s4whzk7rf8w3vpqkh"; + rev = "b9ef24875ce1d9bf5f04f0164ae95f729330a295"; + sha256 = "0hxwp4nk5an3a2pmha6x2729mxm57j52vnrsq47gir31c0hk6x2x"; }; NIX_LDFLAGS = "-lgcc_s"; |