From 6b692bc86814f9859393f2e9b2a2e8b3486f4f6b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 26 Jan 2023 13:19:22 +0000 Subject: [PATCH] libelf: use autoreconfHook for NetBSD cross MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was a precedence mistake when I added this conditional — the ++ that adds autoreconfHook only took effect in the else branch. Fixes: fc04308b0ad ("libelf: fix build on NetBSD") --- pkgs/development/libraries/libelf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 07873f4197e3..fd3679aa8f63 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = - if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ] + (if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ]) # Need to regenerate configure script with newer version in order to pass # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper` # which doesn't work with the bootstrapTools bash, so can only do this