philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

pjsip: enable and fix darwin build

gstqt5
Daiderd Jordan 2020-04-08 21:29:11 +02:00
parent 32e4d072a0
commit 7e23a6021d
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
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 { stdenv.mkDerivation rec {
pname = "pjsip"; pname = "pjsip";
@ -11,12 +11,19 @@ stdenv.mkDerivation rec {
sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0"; 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 = '' preConfigure = ''
export LD=$CC export LD=$CC
'' # Fixed on master, remove with 2.11
+ stdenv.lib.optionalString stdenv.isDarwin ''
NIX_CFLAGS_COMPILE+=" -framework Security"
''; '';
postInstall = '' postInstall = ''
@ -29,11 +36,11 @@ stdenv.mkDerivation rec {
# We need the libgcc_s.so.1 loadable (for pthread_cancel to work) # We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
dontPatchELF = true; 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"; 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/"; homepage = "https://pjsip.org/";
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [olynch]; maintainers = with maintainers; [ olynch ];
platforms = with stdenv.lib.platforms; linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

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

@ -25764,7 +25764,9 @@ in
physlock = callPackage ../misc/screensavers/physlock { }; 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 { }; pounce = callPackage ../servers/pounce { };