From bd84f9838a210ee1d9a616cd4b441e89cd6526a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 8 Nov 2025 09:39:35 +0100
Subject: [PATCH] Revert "spandsp: backport additional memory safety fix"

This reverts commit 09ad6013c68ecfb655bfe613b4ecb10acb32cca3.
---
 .../development/libraries/spandsp/default.nix | 32 +++----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 87996abdeeb0..9720e110f7cf 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -2,8 +2,6 @@
   fetchurl,
   fetchpatch,
   callPackage,
-  lib,
-  stdenv,
 }:
 
 (callPackage ./common.nix { }) rec {
@@ -13,31 +11,11 @@
     sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
   };
   patches = [
-    # FIXME: clean up rebuild avoidance on staging.
-    (
-      if
-        lib.elem stdenv.hostPlatform.config [
-          "arm64-apple-darwin"
-          "aarch64-unknown-linux-gnu"
-          "x86_64-apple-darwin"
-          "x86_64-unknown-linux-gnu"
-        ]
-      then
-        fetchpatch {
-          url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch";
-          includes = [ "spandsp-sim/g1050.c" ];
-          hash = "sha256-TwMhWJXQG/UaWddWgice0klp1uATyHMiE6DcsCebXYQ=";
-        }
-      else
-        fetchpatch {
-          url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch";
-          includes = [
-            "spandsp-sim/g1050.c"
-            "spandsp-sim/test_utils.c"
-          ];
-          hash = "sha256-2MmVgyMUK0Zn+mL7IX57Y7brYpgmt4GVlis5/NstuNM=";
-        }
-    )
+    (fetchpatch {
+      url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch";
+      includes = [ "spandsp-sim/g1050.c" ];
+      hash = "sha256-TwMhWJXQG/UaWddWgice0klp1uATyHMiE6DcsCebXYQ=";
+    })
     (fetchpatch {
       url = "https://github.com/freeswitch/spandsp/commit/f47bcdc301fbddad44e918939eed1b361882f740.patch";
       hash = "sha256-O+lIC3V92GVFoiHsUQOXkoTN2hJ7v5+LQP7RrAhvwlY=";