diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
commit | 716aac2519a7571e7f5fd984a886d579a4a051c5 (patch) | |
tree | 53cf89cf764d787f4dc8f08474479892b9733177 /pkgs/development/libraries/libtoxcore | |
parent | f8472457a440de3c44f6f604142d678b6ae2a762 (diff) | |
parent | 53b389327e34de319dc0dbda2b6bcab1a69db69d (diff) |
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs/development/libraries/libtoxcore')
-rw-r--r-- | pkgs/development/libraries/libtoxcore/new-api/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/libtoxcore/old-api/default.nix | 8 |
2 files changed, 7 insertions, 16 deletions
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix index 0433d1466809..70363b830255 100644 --- a/pkgs/development/libraries/libtoxcore/new-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus +{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "tox-core-dev-20150629"; + name = "tox-core-dev-20160105"; src = fetchFromGitHub { owner = "irungentoo"; repo = "toxcore"; - rev = "219fabc0f5dbaac7968cb7728d25dface3ebb2ea"; - sha256 = "1rsnxa5b7i2zclx0kzbf4a5mds0jfkvfjz1s4whzk7rf8w3vpqkh"; + rev = "b9ef24875ce1d9bf5f04f0164ae95f729330a295"; + sha256 = "0hxwp4nk5an3a2pmha6x2729mxm57j52vnrsq47gir31c0hk6x2x"; }; NIX_LDFLAGS = "-lgcc_s"; @@ -22,10 +22,6 @@ stdenv.mkDerivation rec { auto_tests/tox_test.c ''; - preConfigure = '' - autoreconf -i - ''; - configureFlags = [ "--with-libsodium-headers=${libsodium.dev}/include" "--with-libsodium-libs=${libsodium.out}/lib" @@ -34,8 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - autoconf libtool automake libsodium ncurses - check libconfig pkgconfig + autoreconfHook libsodium ncurses check libconfig pkgconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus ]; diff --git a/pkgs/development/libraries/libtoxcore/old-api/default.nix b/pkgs/development/libraries/libtoxcore/old-api/default.nix index 6bc69792b53a..2fb5e93eab95 100644 --- a/pkgs/development/libraries/libtoxcore/old-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/old-api/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus +{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: let @@ -26,10 +26,6 @@ stdenv.mkDerivation rec { auto_tests/tox_test.c ''; - preConfigure = '' - autoreconf -i - ''; - configureFlags = [ "--with-libsodium-headers=${libsodium.dev}/include" "--with-libsodium-libs=${libsodium.out}/lib" @@ -38,7 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - autoconf libtool automake libsodium ncurses + autoreconfHook libsodium ncurses check libconfig pkgconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus |