From 302bf6acc5e4defbf72c2443f64cc4f6cd31631c Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Wed, 16 Apr 2025 22:27:34 +0800
Subject: [PATCH] pjsip: 2.14.1 -> 2.15.1

---
 pkgs/by-name/pj/pjsip/fix-aarch64.patch | 13 -------------
 pkgs/by-name/pj/pjsip/package.nix       | 11 ++++++-----
 2 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/by-name/pj/pjsip/fix-aarch64.patch

diff --git a/pkgs/by-name/pj/pjsip/fix-aarch64.patch b/pkgs/by-name/pj/pjsip/fix-aarch64.patch
deleted file mode 100644
index 1680bde707ca..000000000000
--- a/pkgs/by-name/pj/pjsip/fix-aarch64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/aconfigure
-+++ b/aconfigure
-@@ -9174,6 +9174,10 @@
-				 ac_webrtc_instset=neon
-				 ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64"
-			    	 ;;
-+                             arm64*|aarch64*)
-+                                 ac_webrtc_instset=neon
-+                                 ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64"
-+                                 ;;
-                              *)
-                                  ac_webrtc_instset=sse2
-                                  ;;
diff --git a/pkgs/by-name/pj/pjsip/package.nix b/pkgs/by-name/pj/pjsip/package.nix
index 5d0e9484c838..53219b38c98e 100644
--- a/pkgs/by-name/pj/pjsip/package.nix
+++ b/pkgs/by-name/pj/pjsip/package.nix
@@ -13,17 +13,15 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "pjsip";
-  version = "2.14.1";
+  version = "2.15.1";
 
   src = fetchFromGitHub {
     owner = "pjsip";
     repo = "pjproject";
     tag = finalAttrs.version;
-    hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY=";
+    hash = "sha256-9WzOIKWGy71OMzaPOp1P8/pvhHio2rDJOkH1VaNItjU=";
   };
 
-  patches = [ ./fix-aarch64.patch ];
-
   postPatch = ''
     substituteInPlace \
       pjsip-apps/src/py_pjsua/setup.py \
@@ -48,7 +46,10 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
 
   env =
-    lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }
+    {
+      NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
+    }
+    // lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }
     // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
       NIX_CFLAGS_LINK = "-headerpad_max_install_names";
     };