From 7e23a6021d7bcab107d826e2241e268de519fcfa Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 8 Apr 2020 21:29:11 +0200 Subject: [PATCH] pjsip: enable and fix darwin build --- .../applications/networking/pjsip/default.nix | 21 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 6ac2e89cf40e..7319dd4a44fa 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ed077889041..f07162a0e1a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25764,7 +25764,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 { };