tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

linux stdenv: Update gnu-config on all non-x86

Not just Aarch64. Other non-x86 platforms might be old enough, but I am
about to update gnu-config to handle things better across the board.

John Ericson eebd455d 29ef982a

+4 -4
unified split
+4 -4
pkgs/stdenv/linux/default.nix
··· 255 }; 256 extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ 257 # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. 258 - lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; 259 }) 260 261 ··· 297 }; 298 extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++ 299 # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. 300 - lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; 301 }) 302 303 # Construct the final stdenv. It uses the Glibc and GCC, and adds ··· 327 328 extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ 329 # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. 330 - lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook; 331 332 cc = prevStage.gcc; 333 ··· 361 binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params 362 ] 363 ++ lib.optional (localSystem.libc == "musl") libiconv 364 - ++ lib.optionals localSystem.isAarch64 365 [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; 366 367 overrides = self: super: {
··· 255 }; 256 extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ 257 # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. 258 + lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook; 259 }) 260 261 ··· 297 }; 298 extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++ 299 # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. 300 + lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook; 301 }) 302 303 # Construct the final stdenv. It uses the Glibc and GCC, and adds ··· 327 328 extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ 329 # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. 330 + lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook; 331 332 cc = prevStage.gcc; 333 ··· 361 binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params 362 ] 363 ++ lib.optional (localSystem.libc == "musl") libiconv 364 + ++ lib.optionals (!localSystem.isx86) 365 [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]; 366 367 overrides = self: super: {