diff options
author | Robin Gloster <mail@glob.in> | 2016-01-17 23:04:40 +0000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 10:45:31 +0100 |
commit | 53b389327e34de319dc0dbda2b6bcab1a69db69d (patch) | |
tree | 04dece6a1e346ccb4563f61ec206cf03dc46e77f /pkgs/development/libraries/libtoxcore | |
parent | 620c147ccee09d7d068fa21b2b5b94b6695993a5 (diff) | |
download | nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar.gz nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar.bz2 nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar.lz nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar.xz nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.tar.zst nixlib-53b389327e34de319dc0dbda2b6bcab1a69db69d.zip |
refactor to use autoreconfHook where possible
Close #12446.
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 |