Update libtoxcore and qtox to the newest dev version
As from now qtox depends on openalSoft instead of openal. This is due to incompatibilities between those to two implementations. Anyway, this should be okay because their official debian package depends on openalSoft as well.
This commit is contained in:
parent
c347f1c26f
commit
c57a4c2f78
|
@ -1,29 +1,30 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv
|
||||
, libsodium }:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qtox-dev-20140918";
|
||||
name = "qtox-dev-20141201";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tux3";
|
||||
repo = "qTox";
|
||||
rev = "f06ec65bca";
|
||||
sha256 = "0r7qc444bgsxawyya5nw3xk1c50b90307lcwazs8mn35h4snr97m";
|
||||
rev = "qtox-windows-1417469442.11";
|
||||
sha256 = "02nxj0w5qbgc79n8mgyqldk1yadf4p8pysn79f7fvi8fxq4j0j5n";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig libtoxcore qt5 openal opencv ];
|
||||
buildInputs = [ pkgconfig libtoxcore qt5 openalSoft opencv libsodium ];
|
||||
|
||||
configurePhase = "qmake";
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir $out/bin
|
||||
cp qtox $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "QT Tox client";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = with maintainers; [ viric jgeerds ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
, libvpx, check, libconfig, pkgconfig }:
|
||||
|
||||
let
|
||||
version = "900d72f951";
|
||||
date = "20140921";
|
||||
version = "f6b3e6e8fe98d2457827ac6da944e715f008a08a";
|
||||
date = "20141203";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tox-core-${date}-${version}";
|
||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchurl {
|
||||
url = "https://github.com/irungentoo/toxcore/tarball/${version}";
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "1fwgflizb21mp4jwkfac7mgmahlly1f3ldbma6h8h6a2qf3pkn2r";
|
||||
sha256 = "1zsx7saqs25vva3pp0bw31yqzrn40fx84w42ig6fiv723k9gpdzy";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lgcc_s";
|
||||
|
@ -47,10 +47,10 @@ stdenv.mkDerivation rec {
|
|||
# Some tests fail in the Sheevaplug due to timeout
|
||||
doCheck = !stdenv.isArm;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ viric jgeerds ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue