From dfb2f6151983074396b670c4808b88c50a227ed5 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sun, 20 Sep 2015 13:32:43 -0700 Subject: [PATCH] fix autoreconfHook --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4de12627c29..3385c2b166b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -269,7 +269,7 @@ let autonix = import ../build-support/autonix { inherit pkgs; }; autoreconfHook = makeSetupHook - { substitutions = { inherit autoconf automake libtool gettext; }; } + { substitutions = { inherit autoconf automake gettext; libtool = realLibtool; }; } ../build-support/setup-hooks/autoreconf.sh; buildEnv = callPackage ../build-support/buildenv {}; @@ -5564,7 +5564,9 @@ let libtool = if stdenv.isDarwin then darwin.cctools - else libtool_2; + else realLibtool; + + realLibtool = libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { };