mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
pjsip: 2.14.1 -> 2.15.1
This commit is contained in:
parent
199f40f70e
commit
302bf6acc5
2 changed files with 6 additions and 18 deletions
|
@ -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
|
|
||||||
;;
|
|
|
@ -13,17 +13,15 @@
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "pjsip";
|
pname = "pjsip";
|
||||||
version = "2.14.1";
|
version = "2.15.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pjsip";
|
owner = "pjsip";
|
||||||
repo = "pjproject";
|
repo = "pjproject";
|
||||||
tag = finalAttrs.version;
|
tag = finalAttrs.version;
|
||||||
hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY=";
|
hash = "sha256-9WzOIKWGy71OMzaPOp1P8/pvhHio2rDJOkH1VaNItjU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./fix-aarch64.patch ];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace \
|
substituteInPlace \
|
||||||
pjsip-apps/src/py_pjsua/setup.py \
|
pjsip-apps/src/py_pjsua/setup.py \
|
||||||
|
@ -48,7 +46,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
|
] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;
|
||||||
|
|
||||||
env =
|
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 {
|
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||||
NIX_CFLAGS_LINK = "-headerpad_max_install_names";
|
NIX_CFLAGS_LINK = "-headerpad_max_install_names";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue