diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2014-09-18 09:51:43 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2014-09-29 10:24:35 +0200 |
| commit | 04b3932117e4ffd7fff2529684349303e87ffe19 (patch) | |
| tree | de5c252e3d577be260c941ed0c87465f5eabb38b /pkgs | |
| parent | 1b6101775db8ed77d401164c15361b50be12b341 (diff) | |
| download | nixlib-04b3932117e4ffd7fff2529684349303e87ffe19.tar nixlib-04b3932117e4ffd7fff2529684349303e87ffe19.tar.gz nixlib-04b3932117e4ffd7fff2529684349303e87ffe19.tar.bz2 nixlib-04b3932117e4ffd7fff2529684349303e87ffe19.tar.lz nixlib-04b3932117e4ffd7fff2529684349303e87ffe19.tar.xz nixlib-04b3932117e4ffd7fff2529684349303e87ffe19.tar.zst nixlib-04b3932117e4ffd7fff2529684349303e87ffe19.zip | |
Adding qtox. Making libtoxcore propagate libvpx.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/qtox/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/development/libraries/libtoxcore/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 35 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix new file mode 100644 index 000000000000..438b6f35145d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv }: + + +stdenv.mkDerivation rec { + name = "qtox-dev-20140918"; + + src = fetchFromGitHub { + owner = "tux3"; + repo = "qTox"; + rev = "f06ec65bca"; + sha256 = "0r7qc444bgsxawyya5nw3xk1c50b90307lcwazs8mn35h4snr97m"; + }; + + buildInputs = [ pkgconfig libtoxcore qt5 openal opencv ]; + + configurePhase = "qmake"; + + installPhase = '' + ensureDir $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; + }; +} diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 4815714e48d3..25f6527e98a0 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -37,10 +37,12 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf libtool automake libsodium ncurses libopus - libvpx check libconfig pkgconfig + check libconfig pkgconfig ]; - doCheck = false; # certian tests fail, upstream advice is to wait + propagatedBuildInputs = [ libvpx ]; + + doCheck = true; meta = { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89058f23f89a..098380a89b16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9986,6 +9986,8 @@ let qsynth = callPackage ../applications/audio/qsynth { }; + qtox = callPackage ../applications/networking/instant-messengers/qtox { }; + qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; qtractor = callPackage ../applications/audio/qtractor { }; |