public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor to use autoreconfHook where possible

Browse Source 
Close #12446.
This commit is contained in:
Robin Gloster
2016-01-18 10:45:31 +01:00
committed by Vladimír Čunát
parent 620c147cce
commit 53b389327e
50 changed files with 188 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libtoxcore/new-api/default.nix
+2 -7
View File
@@ -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
];
pkgs/development/libraries/libtoxcore/old-api/default.nix
+2 -6
View File
@@ -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