summary refs log tree commit diff
path: root/pkgs/applications/networking/pjsip
diff options
context:
space:
mode:
authorlinsui <linsui555@gmail.com>2021-10-04 14:12:20 +0800
committerlinsui <linsui555@gmail.com>2021-10-04 14:12:20 +0800
commit4b866da20b8a43764d46280dec118b6c13af198a (patch)
treeadc4802ceef832e069a0f55b8788c284b98b4372 /pkgs/applications/networking/pjsip
parent3c5ac430cad48050d5246053c7004aa5bc3d3148 (diff)
downloadnixpkgs-4b866da20b8a43764d46280dec118b6c13af198a.tar
nixpkgs-4b866da20b8a43764d46280dec118b6c13af198a.tar.gz
nixpkgs-4b866da20b8a43764d46280dec118b6c13af198a.tar.bz2
nixpkgs-4b866da20b8a43764d46280dec118b6c13af198a.tar.lz
nixpkgs-4b866da20b8a43764d46280dec118b6c13af198a.tar.xz
nixpkgs-4b866da20b8a43764d46280dec118b6c13af198a.tar.zst
nixpkgs-4b866da20b8a43764d46280dec118b6c13af198a.zip
pjsip: 2.10 -> 2.11.1
Diffstat (limited to 'pkgs/applications/networking/pjsip')
-rw-r--r--pkgs/applications/networking/pjsip/default.nix7
-rw-r--r--pkgs/applications/networking/pjsip/fix-aarch64.patch8
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 84e52128b66..5a0d3e4870a 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/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 = ''
diff --git a/pkgs/applications/networking/pjsip/fix-aarch64.patch b/pkgs/applications/networking/pjsip/fix-aarch64.patch
index f4aabf7a9bb..1680bde707c 100644
--- a/pkgs/applications/networking/pjsip/fix-aarch64.patch
+++ b/pkgs/applications/networking/pjsip/fix-aarch64.patch
@@ -1,9 +1,9 @@
 --- a/aconfigure
 +++ b/aconfigure
-@@ -8945,6 +8945,10 @@
-                                  ac_webrtc_instset=neon
-                                  ac_webrtc_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon"
-                                  ;;
+@@ -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"