Author: eelco
Date: Sat May 19 02:52:36 2012
New Revision: 34181
URL: https://nixos.org/websvn/nix/?rev=34181&sc=1
Log:
* Add a setup hook ‘autoreconfHook’ to simplify packages that need to
run autoreconf:
buildInputs = [ autoreconfHook ];
is essentially equivalent to
buildInputs = [ autoconf automake libtool ];
preConfigure = "autoreconf -i";
Added:
nixpkgs/branches/x-updates/pkgs/build-support/setup-hooks/
- copied from r34142,
nixpkgs/branches/x-updates/pkgs/build-support/make-wrapper/
nixpkgs/branches/x-updates/pkgs/build-support/setup-hooks/autoreconf.sh
Deleted:
nixpkgs/branches/x-updates/pkgs/build-support/make-wrapper/
Modified:
nixpkgs/branches/x-updates/pkgs/os-specific/linux/mountall/default.nix
nixpkgs/branches/x-updates/pkgs/os-specific/linux/usbutils/default.nix
nixpkgs/branches/x-updates/pkgs/tools/networking/sitecopy/default.nix
nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
Added: nixpkgs/branches/x-updates/pkgs/build-support/setup-hooks/autoreconf.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/build-support/setup-hooks/autoreconf.sh
Sat May 19 02:52:36 2012 (r34181)
@@ -0,0 +1,11 @@
+preConfigurePhases+=" autoreconfPhase"
+
+for i in @autoconf@ @automake@ @libtool@; do
+ findInputs $i nativePkgs propagated-build-native-inputs
+done
+
+autoreconfPhase() {
+ runHook preAutoreconf
+ autoreconf ${autoreconfFlags:---install --force}
+ runHook postAutoreconf
+}
Modified: nixpkgs/branches/x-updates/pkgs/os-specific/linux/mountall/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/os-specific/linux/mountall/default.nix
Sat May 19 00:44:30 2012 (r34180)
+++ nixpkgs/branches/x-updates/pkgs/os-specific/linux/mountall/default.nix
Sat May 19 02:52:36 2012 (r34181)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, autoconf, automake,
libtool, gettext }:
+{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, gettext, autoreconfHook }:
stdenv.mkDerivation {
name = "mountall-2.35";
@@ -10,9 +10,7 @@
patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ];
- preConfigure = "rm -R aclocal.m4; gettextize -f; autoreconf -vfi";
-
- buildInputs = [ pkgconfig libnih dbus.libs udev autoconf automake libtool
gettext ];
+ buildInputs = [ pkgconfig libnih dbus.libs udev gettext autoreconfHook ];
makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks
upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs";
Modified: nixpkgs/branches/x-updates/pkgs/os-specific/linux/usbutils/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/os-specific/linux/usbutils/default.nix
Sat May 19 00:44:30 2012 (r34180)
+++ nixpkgs/branches/x-updates/pkgs/os-specific/linux/usbutils/default.nix
Sat May 19 02:52:36 2012 (r34181)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb1, zlib, autoconf, automake, libtool }:
+{ stdenv, fetchurl, pkgconfig, libusb1, zlib, autoreconfHook }:
let
@@ -18,7 +18,7 @@
sha256 = "05sxkm7b7lj8p8kr8kw68m49h66351s803z42233b8lssmc3wlra";
};
- buildInputs = [ pkgconfig libusb1 autoconf automake libtool zlib ];
+ buildInputs = [ pkgconfig libusb1 autoreconfHook ];
preConfigure = "autoreconf -i";
Modified: nixpkgs/branches/x-updates/pkgs/tools/networking/sitecopy/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/tools/networking/sitecopy/default.nix
Sat May 19 00:44:30 2012 (r34180)
+++ nixpkgs/branches/x-updates/pkgs/tools/networking/sitecopy/default.nix
Sat May 19 02:52:36 2012 (r34181)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, neon, zlib, openssl, autoconf, automake, libtool }:
+{ stdenv, fetchurl, neon, zlib, openssl, autoreconfHook }:
stdenv.mkDerivation rec {
name = "sitecopy-0.16.6";
@@ -10,9 +10,7 @@
patches = [ ./neon-29.patch ];
- preConfigure = "autoreconf";
-
- buildInputs = [ openssl neon zlib autoconf automake libtool ];
+ buildInputs = [ openssl neon zlib autoreconfHook ];
configureFlags= "--with-ssl=openssl";
}
Modified: nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Sat May 19
00:44:30 2012 (r34180)
+++ nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Sat May 19
02:52:36 2012 (r34181)
@@ -245,6 +245,10 @@
theAttrSet = arg;
};
+ autoreconfHook = makeSetupHook
+ { substitutions = { inherit autoconf automake libtool; }; }
+ ../build-support/setup-hooks/autoreconf.sh;
+
buildEnv = import ../build-support/buildenv {
inherit (pkgs) runCommand perl;
};
@@ -327,7 +331,7 @@
inherit stdenv perl cpio contents ubootChooser;
};
- makeWrapper = makeSetupHook {} ../build-support/make-wrapper/make-wrapper.sh;
+ makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
makeModulesClosure = {kernel, rootModules, allowMissing ? false}:
import ../build-support/kernel/modules-closure.nix {
@@ -5824,9 +5828,7 @@
module_init_tools = callPackage ../os-specific/linux/module-init-tools { };
- mountall = callPackage ../os-specific/linux/mountall {
- automake = automake111x;
- };
+ mountall = callPackage ../os-specific/linux/mountall { };
aggregateModules = modules:
import ../os-specific/linux/module-init-tools/aggregator.nix {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
