From 99d0e4996d3a7a247df0546775a48506c84220b7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Oct 2024 16:20:53 +0200 Subject: [PATCH] binutils: remove autoreconfHook on iOS This was added in ebc224377853 ("binutils: Add iOS as a supported platform"), at the same time as a patch. That patch was removed in 045c2d219ddb ("binutils-unwrapped: remove broken iOS patch"), and I'm not sure what other reason there would be for autoreconfHook to be required specifically for iOS, so I think we can remove it. It's not possible to test since iOS cross has been broken for months, and keeping this around is making other refactors (like adding cross binutils packages) harder. --- pkgs/development/tools/misc/binutils/default.nix | 2 -- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 9e52960f8737d..6ad81d11fc547 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -3,7 +3,6 @@ let in { stdenv -, autoreconfHook , autoconf269, automake, libtool , bison , buildPackages @@ -116,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: { bison perl ] - ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ] ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ] ++ lib.optionals targetPlatform.isVc4 [ flex ] ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb0c7edb8f345..60e843c0abd69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17022,13 +17022,11 @@ with pkgs; bingrep = callPackage ../development/tools/analysis/bingrep { }; binutils-unwrapped = callPackage ../development/tools/misc/binutils { - autoreconfHook = autoreconfHook269; inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils { - autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs;