From d8ed82cfdfc753993e766a33d0099acef55cbab5 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 15 Jun 2024 11:37:20 +0000
Subject: [PATCH] cross: remove upstreamed libvpx patch

---
 overlays/cross.nix               | 6 ------
 pkgs/additional/nixpkgs/list.nix | 7 -------
 2 files changed, 13 deletions(-)

diff --git a/overlays/cross.nix b/overlays/cross.nix
index 1b7d832a..5dadb0f8 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -751,12 +751,6 @@ in with final; {
   #   ];
   # });
 
-  # upstreaming: <https://github.com/NixOS/nixpkgs/pull/317477>
-  libvpx = prev.libvpx.overrideAttrs (upstream: {
-    # fails building neon extensions for armv7l; see <https://github.com/NixOS/nixpkgs/issues/208746>
-    configureFlags = builtins.map (lib.replaceStrings [ "armv7l-linux-gcc" ] [ "armv7-linux-gcc" ]) upstream.configureFlags;
-  });
-
   # 2024/05/31: upstreaming blocked on qtsvg, libgweather, appstream, glycin-loaders
   loupe = prev.loupe.overrideAttrs (upstream: {
     postPatch = (upstream.postPatch or "") + ''
diff --git a/pkgs/additional/nixpkgs/list.nix b/pkgs/additional/nixpkgs/list.nix
index 5d4b683e..0263f54f 100644
--- a/pkgs/additional/nixpkgs/list.nix
+++ b/pkgs/additional/nixpkgs/list.nix
@@ -24,13 +24,6 @@ let
     );
 in
 [
-  # TODO: apply this once it's fixed for aarch64
-  # (fetchpatch' {
-  #   title = "libvpx: fix cross compiling for armv7";
-  #   prUrl = "https://github.com/NixOS/nixpkgs/pull/317477";
-  #   hash = "sha256-5W/5/u2CXJJEgTjPx/do6SRZ6WEfhlAi/qXYS/Lsb14=";
-  # })
-
   # (fetchpatch' {
   #   title = "pantheon.switchboard-plug-sound: support cross compilation";
   #   saneCommit = "86f85de8d008710a11b7b3653ec594438374059e";