Merge pull request #238072 from amjoseph-nixpkgs/pr/stdenv/update-gnu-config-unconditionally+

stdenv: eliminate duplicate gnu-config in extraNativeBuildInputs
This commit is contained in:
Weijia Wang
2023-06-16 14:03:03 +03:00
committed by GitHub
+1 -3
View File
@@ -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: {