From d4c661fb27a1f591bb51896db046606e18dde687 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 6 Jul 2019 05:01:27 +0200 Subject: [PATCH 1/2] pjsip: 2.8 -> 2.9 --- pkgs/applications/networking/pjsip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 1e067b3c335..93b8a44836c 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pjsip-${version}"; - version = "2.8"; + version = "2.9"; src = fetchurl { url = "https://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah"; + sha256 = "0dm6l8fypkimmzvld35zyykbg957cm5zb4ny3lchgv68amwfz1fi"; }; buildInputs = [ openssl libsamplerate alsaLib ]; From 53506d9c151884df050e3ccc125c51d2a9f53e4e Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 6 Jul 2019 05:01:43 +0200 Subject: [PATCH 2/2] pjsip: Fix compilation on aarch64 --- pkgs/applications/networking/pjsip/default.nix | 2 ++ .../applications/networking/pjsip/fix-aarch64.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/networking/pjsip/fix-aarch64.patch diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 93b8a44836c..8a66c039b5a 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0dm6l8fypkimmzvld35zyykbg957cm5zb4ny3lchgv68amwfz1fi"; }; + patches = [ ./fix-aarch64.patch ]; + buildInputs = [ openssl libsamplerate alsaLib ]; preConfigure = '' diff --git a/pkgs/applications/networking/pjsip/fix-aarch64.patch b/pkgs/applications/networking/pjsip/fix-aarch64.patch new file mode 100644 index 00000000000..f4aabf7a9bb --- /dev/null +++ b/pkgs/applications/networking/pjsip/fix-aarch64.patch @@ -0,0 +1,13 @@ +--- a/aconfigure ++++ b/aconfigure +@@ -8945,6 +8945,10 @@ + ac_webrtc_instset=neon + ac_webrtc_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon" + ;; ++ arm64*|aarch64*) ++ ac_webrtc_instset=neon ++ ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64" ++ ;; + *) + ac_webrtc_instset=sse2 + ;;