public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtox: 20151221 -> 1.2.4, libtoxcore-dev: 20160105 -> 20160131

This commit is contained in:
tg(x) 2016-02-15 01:07:15 +01:00
parent 06ce6ba757
commit 7b91d708af
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/instant-messengers/qtox/default.nix
View File

@ -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, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper, pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper,
qtbase, qtsvg, qttools, qttranslations, sqlcipher }: qtbase, qtsvg, qttools, qttranslations, sqlcipher }:
let let
revision = "8b671916abdcc1d553a367a502b23ec4ea7568a1"; version = "1.2.4";
revision = "v${version}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qtox-dev-20151221"; name = "qtox-${version}";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/tux3/qTox.git"; owner = "tux3";
rev = "${revision}"; repo = "qTox";
md5 = "a93a63d35e506be4b21abda0986f19e7"; rev = revision;
sha256 = "0iqnl00kmbpf3pn6z38n3cjzzsqpw2793j60c24kkrydapihknz9";
}; };
buildInputs = 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 cairo)"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)" 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 atk)"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)"
''; '';
configurePhase = '' configurePhase = ''

7
pkgs/development/libraries/libtoxcore/new-api/default.nix
View File

@ -2,13 +2,13 @@
, libvpx, check, libconfig, pkgconfig }: , libvpx, check, libconfig, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tox-core-dev-20160105"; name = "tox-core-dev-20160131";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "irungentoo"; owner = "irungentoo";
repo = "toxcore"; repo = "toxcore";
rev = "b9ef24875ce1d9bf5f04f0164ae95f729330a295"; rev = "94cc8b11ff473064526737936f64b6f9a19c239d";
sha256 = "0hxwp4nk5an3a2pmha6x2729mxm57j52vnrsq47gir31c0hk6x2x"; sha256 = "0njara08p5vmhs6kp04b7gxw8l6xrlmwnlb76n2g96v0rn0i9k2w";
}; };
NIX_LDFLAGS = "-lgcc_s"; NIX_LDFLAGS = "-lgcc_s";
@ -52,4 +52,3 @@ stdenv.mkDerivation rec {
platforms = platforms.all; platforms = platforms.all;
}; };
} }