From 4955cb9a09db723b52cda7f641244be62366c335 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 21 Oct 2024 16:09:32 +0200
Subject: [PATCH] binutils-unwrapped: remove broken vc4 sources

This hasn't made it past patchPhase since dde943e5356b ("Revert
"Revert "Merge pull request #86954 from
lovesegfault/binutils-2.34"""), more than four ago.  It's therefore
safe to say that nobody depends on this continuing to work in recent
Nixpkgs, and all these targetPlatform conditionals are making new
development (like adding cross binutils packages), so let's just
remove it.

It can be brought back if somebody wants to make it work in future,
but given that upstream binutils will continue to diverge from the
stagnant vc4 fork, a better way of doing this would be to upstream vc4
support to binutils, or at the very least use a different expression
for vc4 binutils.
---
 .../tools/misc/binutils/default.nix           | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 9e52960f8737..d91b6f33bd39 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -9,7 +9,6 @@ in
 , buildPackages
 , fetchFromGitHub
 , fetchurl
-, flex
 , gettext
 , lib
 , noSysDirs
@@ -35,19 +34,6 @@ let
 
   version = "2.43.1";
 
-  srcs = {
-    normal = fetchurl {
-      url = "mirror://gnu/binutils/binutils-${version}.tar.bz2";
-      hash = "sha256-vsqsXSleA3WHtjpC+tV/49nXuD9HjrJLZ/nuxdDxhy8=";
-    };
-    vc4-none = fetchFromGitHub {
-      owner = "itszor";
-      repo = "binutils-vc4";
-      rev = "708acc851880dbeda1dd18aca4fd0a95b2573b36";
-      sha256 = "1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63";
-    };
-  };
-
   #INFO: The targetPrefix prepended to binary names to allow multiple binuntils
   # on the PATH to both be usable.
   targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
@@ -57,7 +43,10 @@ stdenv.mkDerivation (finalAttrs: {
   pname = targetPrefix + "binutils";
   inherit version;
 
-  src = srcs.${targetPlatform.system} or srcs.normal;
+  src = fetchurl {
+    url = "mirror://gnu/binutils/binutils-${version}.tar.bz2";
+    hash = "sha256-vsqsXSleA3WHtjpC+tV/49nXuD9HjrJLZ/nuxdDxhy8=";
+  };
 
   # WARN: this package is used for bootstrapping fetchurl, and thus cannot use
   # fetchpatch! All mutable patches (generated by GitHub or cgit) that are
@@ -118,7 +107,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ]
   ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ]
-  ++ lib.optionals targetPlatform.isVc4 [ flex ]
   ;
 
   buildInputs = [ zlib gettext ] ++ lib.optionals hostPlatform.isDarwin [ CoreServices ];