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 | |
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')
-rw-r--r-- | pkgs/development/libraries/cloog-ppl/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/dotconf/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/funambol/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/hivex/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/libgksu/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/libguestfs/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/libivykis/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libpst/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/librdf/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/libraries/libtoxcore/new-api/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/libtoxcore/old-api/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/minizip/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/pkcs11helper/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/spice-gtk/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/tremor/default.nix | 7 |
16 files changed, 48 insertions, 96 deletions
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index 6f730d4821e2..2c49e0363589 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -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 = { diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 97eecf78a1a1..7f5e2f6311b2 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -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 = [ diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 74e4b6c5666d..f44a4a37fa71 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -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"; diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 98049e0ca35a..1fc2b21b5e59 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -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"; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index e048b07a1da1..76836b69d2a8 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -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" diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 7bf1d7cdc713..521e780a9200 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -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 = '' diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 003c1cf3432c..2e3307b54bf5 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -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" \ diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 3ebfb5d8cfcf..8e2a659b3f09 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -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 = '' diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 8fa781c4fdad..78c65d03bfd1 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -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; { diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 58ff77480b63..886663101586 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -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/; 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 diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index b71920446e4c..22657cf38993 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -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"; } diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index c4f0ad16fb76..4092783b0c9b 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -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; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 99f699e301cf..0ef024424b25 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -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 ''; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index c8eb6e3bdab9..aa4a5578691b 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -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 ''; |