From d24297867134a20d4f2af23f28846da83d1b33e4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 6 Sep 2017 11:24:00 -0400 Subject: [PATCH] autoreconfHook: Simplify by avoiding `findInputs` `findInputs` is a stdenv/setup helper we should strive not to call elsewhere. Using normal deps is more idiomatic anyways. --- pkgs/build-support/setup-hooks/autoreconf.sh | 4 ---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh index 441d6b43baa2..c08cab158688 100644 --- a/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -1,9 +1,5 @@ preConfigurePhases+=" autoreconfPhase" -for i in @autoconf@ @automake@ @libtool@ @gettext@; do - findInputs $i nativePkgs propagated-native-build-inputs -done - autoreconfPhase() { runHook preAutoreconf autoreconf ${autoreconfFlags:---install --force --verbose} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab6b17403a4c..fc079f8e2da0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -69,7 +69,7 @@ with pkgs; ### BUILD SUPPORT autoreconfHook = makeSetupHook - { substitutions = { inherit autoconf automake gettext libtool; }; } + { deps = [ autoconf automake gettext libtool ]; } ../build-support/setup-hooks/autoreconf.sh; ensureNewerSourcesHook = { year }: makeSetupHook {}