From cc975df49c31c220e0c012250cb5dc91e6e19eb6 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 17 May 2022 19:37:55 +0200 Subject: [PATCH 1/3] xml-tooling-c: fix build Moved back to C++14 where dynamic exception specifications are deprecated but still present. --- pkgs/development/libraries/xml-tooling-c/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index 9cf3ddb9219..39e25241c94 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + enableParallelBuilding = true; meta = with lib; { From 8a1e40c96bc21e055383297297267a8cc9443d9f Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 17 May 2022 19:43:22 +0200 Subject: [PATCH 2/3] opensaml-cpp: fix build Moved back to C++14 where dynamic exception specifications are deprecated but still present. --- pkgs/development/libraries/opensaml-cpp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 4f83f22856e..1f4ad96c297 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + enableParallelBuilding = true; meta = with lib; { From 6e63244762f1083bc4fd74a61033dbd485f1a574 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 17 May 2022 19:45:59 +0200 Subject: [PATCH 3/3] shibboleth-sp: fix build Moved back to C++14 where dynamic exception specifications are deprecated but still present. --- pkgs/development/libraries/shibboleth-sp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index f3b80c0b548..5dd997352f1 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "--with-fastcgi" ]; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; + enableParallelBuilding = true; meta = with lib; {