diff options
Diffstat (limited to 'pkgs/development/libraries/libtoxcore')
-rw-r--r-- | pkgs/development/libraries/libtoxcore/new-api/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/libtoxcore/old-api/default.nix | 8 |
2 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix index b0e3a09c0b48..d9c543efd6c3 100644 --- a/pkgs/development/libraries/libtoxcore/new-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/new-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 }: stdenv.mkDerivation rec { @@ -22,10 +22,6 @@ stdenv.mkDerivation rec { auto_tests/tox_test.c ''; - preConfigure = '' - autoreconf -i - ''; - configureFlags = [ "--with-libsodium-headers=${libsodium}/include" "--with-libsodium-libs=${libsodium}/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 3ff2e1ad285d..471fafdad38b 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}/include" "--with-libsodium-libs=${libsodium}/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 |