From 0c6a0c817aad863a58d0bf0c8dc55da3c611805a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 25 Nov 2019 21:48:26 -0500 Subject: [PATCH] cctools: only add libtool on native builds libtool is not really needed and it interferes with updateAutotoolsGnuConfigScriptsHook. So remove it when cross-compiling, but leave it in native to preserve hashes. --- pkgs/os-specific/darwin/cctools/port.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index dcb24b3f0d9..f7c67df9448 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -30,7 +30,12 @@ let outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; + nativeBuildInputs = [ autoconf automake ] + + # TODO: remove on next hash change, libtool is unnecessary with autoreconfHook + ++ stdenv.lib.optional (stdenv.targetPlatform == stdenv.hostPlatform) libtool + + ++ [ autoreconfHook ]; buildInputs = [ libuuid ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] ++ stdenv.lib.optional enableTapiSupport libtapi;