From b9c1ae2a5f4662b9d96de881e4bab118d66dbd45 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 16 Jun 2023 02:33:55 -0700 Subject: [PATCH] stdenv: eliminate duplicate gnu-config in extraNativeBuildInputs Accidentally omitted from #237968. --- pkgs/stdenv/linux/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e10e09c56f84..0e483321b935 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -645,12 +645,10 @@ in ++ [ linuxHeaders # propagated from .dev binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params gcc.cc.libgcc glibc.passthru.libgcc ] - ++ lib.optionals (!localSystem.isx86 || localSystem.libc == "musl") - [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ] + ++ [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ] ++ (with gcc-unwrapped.passthru; [ gmp libmpc mpfr isl ]) - ++ [ prevStage.gnu-config ] ; overrides = self: super: {