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

Merge pull request #84750 from LnL7/darwin-pjsip

Browse source 
pjsip: enable and fix darwin build
This commit is contained in:
Daiderd Jordan 2020-05-02 11:35:37 +02:00 committed by GitHub
parent 64279cff00 7e23a6021d
commit afc42a843d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib }:
{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib, AppKit }:
stdenv.mkDerivation rec {
pname = "pjsip";
@ -11,12 +11,19 @@ stdenv.mkDerivation rec {
sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0";
};
patches = [ ./fix-aarch64.patch ];
patches = [
./fix-aarch64.patch
];
buildInputs = [ openssl libsamplerate alsaLib ];
buildInputs = [ openssl libsamplerate ]
++ stdenv.lib.optional stdenv.isLinux alsaLib
++ stdenv.lib.optional stdenv.isDarwin AppKit;
preConfigure = ''
export LD=$CC
'' # Fixed on master, remove with 2.11
+ stdenv.lib.optionalString stdenv.isDarwin ''
NIX_CFLAGS_COMPILE+=" -framework Security"
'';
postInstall = ''
@ -29,11 +36,11 @@ stdenv.mkDerivation rec {
# We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
dontPatchELF = true;
meta = {
meta = with stdenv.lib; {
description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE";
homepage = "https://pjsip.org/";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [olynch];
platforms = with stdenv.lib.platforms; linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ olynch ];
platforms = platforms.linux ++ platforms.darwin;
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -25711,7 +25711,9 @@ in
physlock = callPackage ../misc/screensavers/physlock { };
pjsip = callPackage ../applications/networking/pjsip { };
pjsip = callPackage ../applications/networking/pjsip {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
pounce = callPackage ../servers/pounce { };