From 5ddb74a319a4b20599e73261c8e94f27def3e0ec Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 18 May 2024 18:14:08 +0300 Subject: [PATCH] shibboleth-sp: fix build on darwin --- pkgs/development/libraries/shibboleth-sp/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index ba9956471310..da63b22f9e7e 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c }: +{ lib, stdenv, fetchgit, autoreconfHook, boost, fcgi, openssl, opensaml-cpp, log4shib, pkg-config, xercesc, xml-security-c, xml-tooling-c, darwin }: stdenv.mkDerivation rec { pname = "shibboleth-sp"; @@ -11,17 +11,20 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ]; + buildInputs = [ boost fcgi openssl opensaml-cpp log4shib xercesc xml-security-c xml-tooling-c ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreServices + SystemConfiguration + ]); configureFlags = [ "--without-apxs" "--with-xmltooling=${xml-tooling-c}" "--with-saml=${opensaml-cpp}" "--with-fastcgi" + "CXXFLAGS=-std=c++14" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14"; - enableParallelBuilding = true; meta = with lib; {