Merge pull request #140436 from linsui/pjsip

pkgs/applications/networking/pjsip/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pjsip";
-  version = "2.10";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "pjproject";
     rev = version;
-    sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0";
+    sha256 = "sha256-mqtlxQDIFee93wpdn8oNWmMPDyjYTCmVqF6IJvJbRBM=";
   };
 
   patches = [
@@ -21,9 +21,6 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export LD=$CC
-  '' # Fixed on master, remove with 2.11
-     + lib.optionalString stdenv.isDarwin ''
-    NIX_CFLAGS_COMPILE+=" -framework Security"
   '';
 
   postInstall = ''

pkgs/applications/networking/pjsip/fix-aarch64.patch

@@ -1,8 +1,8 @@
 --- a/aconfigure
 +++ b/aconfigure
-@@ -8945,6 +8945,10 @@
+@@ -9174,6 +9174,10 @@
 				 ac_webrtc_instset=neon
-                                  ac_webrtc_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon"
+				 ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64"
 			    	 ;;
 +                             arm64*|aarch64*)
 +                                 ac_webrtc_instset=neon