From 36c92a0df79d40cd6fb32da24b4fd072f15fceee Mon Sep 17 00:00:00 2001 From: Evan Wallace Date: Wed, 1 Nov 2017 06:21:37 +0000 Subject: [PATCH 1/2] utox: 0.13.1 -> 0.16.1 --- .../networking/instant-messengers/utox/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index d74d3fe3865..7506949f153 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }: +, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }: stdenv.mkDerivation rec { name = "utox-${version}"; - # >= 0.14 should have unit tests and dbus support - version = "0.13.1"; + + version = "0.16.1"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "07aa92isknxf7531jr9kgk89wl5rvv34jrvir043fs9xvim5zq99"; + sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828"; }; buildInputs = [ libtoxcore dbus libvpx libX11 openal freetype libv4l libXrender fontconfig libXext libXft filter-audio - libsodium + libsodium libopus check ]; nativeBuildInputs = [ From 5826097522a22d8e1db72441aac26d68bf31966d Mon Sep 17 00:00:00 2001 From: Evan Wallace Date: Thu, 2 Nov 2017 09:53:09 +0000 Subject: [PATCH 2/2] utox: Fixed test configuration Moved 'check' to nativeBuildInputs, as it is only used by the tests --- .../networking/instant-messengers/utox/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 7506949f153..9c4d88761b8 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore dbus libvpx libX11 openal freetype libv4l libXrender fontconfig libXext libXft filter-audio - libsodium libopus check + libsodium libopus ]; nativeBuildInputs = [ - cmake git pkgconfig + cmake git pkgconfig check ]; cmakeFlags = [ @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { doCheck = false; + checkTarget = "test"; + meta = with stdenv.lib; { description = "Lightweight Tox client"; homepage = https://github.com/uTox/uTox;