Merge pull request #238072 from amjoseph-nixpkgs/pr/stdenv/update-gnu…

…-config-unconditionally+ stdenv: eliminate duplicate gnu-config in extraNativeBuildInputs
NixOS · Jun 16, 2023 · 1e37ab7 · 1e37ab7
2 parents 7f96673 + b9c1ae2
commit 1e37ab7
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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: {