diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-06-16 02:33:55 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-06-16 02:33:57 -0700 |
| commit | b9c1ae2a5f4662b9d96de881e4bab118d66dbd45 (patch) | |
| tree | 2d026eed6115c25b01538b2b5f14f8a19096e0b0 | |
| parent | 7f96673c13b92e6b9d91528bb322c4cad1c95b35 (diff) | |
| download | nixpkgs-b9c1ae2a5f4662b9d96de881e4bab118d66dbd45.tar nixpkgs-b9c1ae2a5f4662b9d96de881e4bab118d66dbd45.tar.gz nixpkgs-b9c1ae2a5f4662b9d96de881e4bab118d66dbd45.tar.bz2 nixpkgs-b9c1ae2a5f4662b9d96de881e4bab118d66dbd45.tar.lz nixpkgs-b9c1ae2a5f4662b9d96de881e4bab118d66dbd45.tar.xz nixpkgs-b9c1ae2a5f4662b9d96de881e4bab118d66dbd45.tar.zst nixpkgs-b9c1ae2a5f4662b9d96de881e4bab118d66dbd45.zip | |
stdenv: eliminate duplicate gnu-config in extraNativeBuildInputs
Accidentally omitted from #237968.
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e10e09c56f8..0e483321b93 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: { |