alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #140436 from linsui/pjsip

Browse source
This commit is contained in:
Sandro 2021-10-04 10:40:02 +02:00 committed by GitHub
parent 5d0dae630d 4b866da20b
commit 9a953bc2dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/networking/pjsip/default.nix
View file

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

8
pkgs/applications/networking/pjsip/fix-aarch64.patch
View file

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