diff options
-rw-r--r-- | pkgs/applications/networking/instant-messengers/qtox/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/libtoxcore/new-api/default.nix | 7 |
2 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 72619e417adb8..541fb5727ced7 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchgit, pkgconfig, libtoxcore-dev, openal, opencv, +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper, qtbase, qtsvg, qttools, qttranslations, sqlcipher }: let - revision = "8b671916abdcc1d553a367a502b23ec4ea7568a1"; + version = "1.2.4"; + revision = "v${version}"; in stdenv.mkDerivation rec { - name = "qtox-dev-20151221"; + name = "qtox-${version}"; - src = fetchgit { - url = "https://github.com/tux3/qTox.git"; - rev = "${revision}"; - md5 = "a93a63d35e506be4b21abda0986f19e7"; + src = fetchFromGitHub { + owner = "tux3"; + repo = "qTox"; + rev = revision; + sha256 = "0iqnl00kmbpf3pn6z38n3cjzzsqpw2793j60c24kkrydapihknz9"; }; buildInputs = @@ -37,6 +39,7 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)" ''; configurePhase = '' diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix index d9c543efd6c30..5bb0427f1813a 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-20160105"; + name = "tox-core-dev-20160131"; src = fetchFromGitHub { owner = "irungentoo"; repo = "toxcore"; - rev = "b9ef24875ce1d9bf5f04f0164ae95f729330a295"; - sha256 = "0hxwp4nk5an3a2pmha6x2729mxm57j52vnrsq47gir31c0hk6x2x"; + rev = "94cc8b11ff473064526737936f64b6f9a19c239d"; + sha256 = "0njara08p5vmhs6kp04b7gxw8l6xrlmwnlb76n2g96v0rn0i9k2w"; }; NIX_LDFLAGS = "-lgcc_s"; @@ -52,4 +52,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - |