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-17 23:04:40 +00: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

11
pkgs/development/libraries/cloog-ppl/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, ppl, autoconf, automake, libtool }:
{ fetchurl, stdenv, ppl, autoreconfHook }:
stdenv.mkDerivation rec {
name = "cloog-ppl-0.15.11";
@@ -10,19 +10,14 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ ppl ];
nativeBuildInputs = [ automake autoconf libtool ];
nativeBuildInputs = [ autoreconfHook ];
patches = [ ./fix-ppl-version.patch ];
configureFlags = "--with-ppl=${ppl}";
preConfigure = ''
preAutoreconf = ''
touch NEWS ChangeLog AUTHORS
${libtool}/bin/libtoolize -c --force
${automake}/bin/aclocal
${automake}/bin/automake --add-missing
${automake}/bin/automake -a -c --foreign
${autoconf}/bin/autoreconf
'';
crossAttrs = {

11
pkgs/development/libraries/dbus/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool
{ stdenv, fetchurl, pkgconfig, autoreconfHook
, expat, systemd, glib, dbus_glib, python
, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }:
@@ -46,14 +46,15 @@ let
done
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
propagatedBuildInputs = [ expat ];
buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
preAutoreconf = ''
substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
'';
preConfigure = ''
patchShebangs .
substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
autoreconf -fi
'';
configureFlags = [

6
pkgs/development/libraries/dotconf/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchFromGitHub, stdenv, autoconf, automake, libtool }:
{ fetchFromGitHub, stdenv, autoreconfHook }:
stdenv.mkDerivation rec {
name = "dotconf-" + version;
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1sc95hw5k2xagpafny0v35filmcn05k1ds5ghkldfpf6xw4hakp7";
};
buildInputs = [ autoconf automake libtool ];
preConfigure = "autoreconf --install";
buildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
description = "A configuration parser library";

12
pkgs/development/libraries/funambol/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, curl, automake, libtool, autoconf, unzip }:
{ stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }:
stdenv.mkDerivation rec {
name = "funambol-client-cpp-9.0.0";
@@ -10,17 +10,9 @@ stdenv.mkDerivation rec {
postUnpack = ''sourceRoot+="/sdk/cpp/build/autotools"'';
# Upstream guys forgotten to run autoreconf...
preConfigure=''
libtoolize -c -f
aclocal
autoheader
automake -a -c -f --add-missing
autoconf -f'';
propagatedBuildInputs = [ zlib curl ];
nativeBuildInputs = [ automake libtool autoconf unzip ];
nativeBuildInputs = [ autoreconfHook unzip ];
meta = {
description = "SyncML client sdk by Funambol project";

8
pkgs/development/libraries/hivex/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, makeWrapper
{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
, perl, libxml2, IOStringy }:
stdenv.mkDerivation rec {
@@ -13,14 +13,10 @@ stdenv.mkDerivation rec {
patches = [ ./hivex-syms.patch ];
buildInputs = [
pkgconfig automake autoconf libtool makeWrapper
pkgconfig autoreconfHook makeWrapper
perl libxml2 IOStringy
];
preConfigure = ''
AUTOPOINT=true autoreconf --verbose --install
'';
postInstall = ''
for bin in $out/bin/*; do
wrapProgram "$bin" --prefix "PATH" : "$out/bin"

7
pkgs/development/libraries/libgksu/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome, gnome3,
libstartup_notification, libgtop, perl, perlXMLParser, autoconf,
automake, libtool, intltool, gtk_doc, docbook_xsl, xauth, sudo
libstartup_notification, libgtop, perl, perlXMLParser,
autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo
}:
stdenv.mkDerivation rec {
@@ -52,13 +52,12 @@ stdenv.mkDerivation rec {
preConfigure = ''
intltoolize --force --copy --automake
autoreconf -vfi
'';
buildInputs = [
pkgconfig makeWrapper gtk gnome.GConf libstartup_notification
gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser
autoconf automake libtool intltool gtk_doc docbook_xsl
autoreconfHook intltool gtk_doc docbook_xsl
];
preFixup = ''

8
pkgs/development/libraries/libguestfs/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool, makeWrapper
{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
, ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
makeWrapper pkgconfig autoconf automake libtool ncurses cpio gperf perl
makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl
cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
SysVirt numactl xen
@@ -28,10 +28,6 @@ stdenv.mkDerivation rec {
patches = [ ./libguestfs-syms.patch ];
NIX_CFLAGS_COMPILE="-I${libxml2}/include/libxml2/";
preConfigure = ''
AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install
'';
postInstall = ''
for bin in $out/bin/*; do
wrapProgram "$bin" \

6
pkgs/development/libraries/libivykis/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, protobufc }:
{ stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }:
stdenv.mkDerivation rec {
name = "libivykis-${version}";
@@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "11d7sjbhcll932rlvx9sf3vk60b5bazmjf4vlr4qd9cz0cashizz";
};
buildInputs = [ autoconf automake libtool pkgconfig file protobufc ];
preConfigure = "autoreconf -i";
buildInputs = [ autoreconfHook pkgconfig file protobufc ];
meta = with stdenv.lib; {
description = ''

8
pkgs/development/libraries/libpst/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, automake, libtool, boost, python, libgsf,
{ stdenv, fetchurl, autoreconfHook, boost, python, libgsf,
pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:
stdenv.mkDerivation rec {
@@ -9,13 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0qih919zk40japs4mpiaw5vyr2bvwz60sjf23gixd5vvzc32cljz";
};
buildInputs = [ autoconf automake libtool boost python libgsf pkgconfig bzip2
buildInputs = [ autoreconfHook boost python libgsf pkgconfig bzip2
xmlto gettext imagemagick doxygen ];
preConfigure = ''
autoreconf -v -f -i
'';
doCheck = true;
meta = with stdenv.lib; {

14
pkgs/development/libraries/librdf/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libtool, automake, autoconf
, librdf_raptor, librdf_raptor2, ladspaH, openssl, zlib #, swh_lv2
{ stdenv, fetchurl, pkgconfig, autoreconfHook
, librdf_raptor2, ladspaH, openssl, zlib
}:
stdenv.mkDerivation rec {
@@ -11,19 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s";
};
preAutoreconf = "rm m4/*";
postPatch = "sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c";
preConfigure = "rm m4/* && autoreconf -if";
buildInputs = [
pkgconfig libtool automake autoconf ladspaH openssl zlib /*swh_lv2*/
#librdf_raptor
];
buildInputs = [ pkgconfig autoreconfHook ladspaH openssl zlib ];
propagatedBuildInputs = [ librdf_raptor2 ];
#doCheck = true; # would need swh_lv2 and some path patching
meta = {
description = "Lightweight RDF library with special support for LADSPA plugins";
homepage = http://sourceforge.net/projects/lrdf/;

9
pkgs/development/libraries/libtoxcore/new-api/default.nix
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
];

8
pkgs/development/libraries/libtoxcore/old-api/default.nix
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

9
pkgs/development/libraries/minizip/default.nix
View File

@@ -1,14 +1,11 @@
{ stdenv, zlib, autoconf, automake, libtool }:
{ stdenv, zlib, autoreconfHook }:
stdenv.mkDerivation {
name = "minizip-${zlib.version}";
inherit (zlib) src;
nativeBuildInputs = [ autoconf automake libtool ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib ];
preConfigure = ''
cd contrib/minizip
autoreconf -vfi
'';
sourceRoot = "zlib-${zlib.version}/contrib/minizip";
}

8
pkgs/development/libraries/pkcs11helper/default.nix
View File

@@ -1,20 +1,18 @@
{ stdenv, fetchurl, pkgconfig, openssl, autoconf, automake, libtool }:
{ stdenv, fetchurl, pkgconfig, openssl, autoreconfHook }:
let
rev = "5d412bad60";
in
stdenv.mkDerivation rec {
name = "pkcs11-helper-20121123-${rev}";
src = fetchurl {
url = "https://github.com/alonbl/pkcs11-helper/tarball/${rev}";
name = "${name}.tar.gz";
sha256 = "1mih6mha39yr5s5m18lg4854qc105asgnwmjw7f95kgmzni62kxp";
};
preConfigure = "autoreconf -vfi";
buildInputs = [ pkgconfig openssl autoconf automake libtool ];
buildInputs = [ pkgconfig openssl autoreconfHook ];
meta = with stdenv.lib; {
homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper;

12
pkgs/development/libraries/spice-gtk/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1
, openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
, cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir, libsoup
, cyrus_sasl, python, pygtk, autoreconfHook, usbredir, libsoup
, gtk3, enableGTK3 ? false }:
with stdenv.lib;
@@ -18,14 +18,16 @@ stdenv.mkDerivation rec {
libjpeg_turbo zlib cyrus_sasl python pygtk usbredir
] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]);
nativeBuildInputs = [ pkgconfig intltool libtool libsoup autoconf automake ];
nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ];
NIX_CFLAGS_COMPILE = "-fno-stack-protector";
preConfigure = ''
preAutoreconf = ''
substituteInPlace src/Makefile.am \
--replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
autoreconf -v --force --install
--replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
'';
preConfigure = ''
intltoolize -f
'';

7
pkgs/development/libraries/tremor/default.nix
View File

@@ -1,19 +1,18 @@
{ stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig, libogg }:
{ stdenv, fetchsvn, autoreconfHook, pkgconfig, libogg }:
stdenv.mkDerivation rec {
name = "tremor-svn-${src.rev}";
src = fetchsvn {
url = http://svn.xiph.org/trunk/Tremor;
rev = "17866";
sha256 = "161411cbefa1527da7a8fc087e78d8e21d19143d3a6eb42fb281e5026aad7568";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
propagatedBuildInputs = [ libogg ];
preConfigure = ''
autoreconf -vfi
sed -i /XIPH_PATH_OGG/d configure
'';