diff options
| author | Robert Scott <code@humanleg.org.uk> | 2024-05-28 21:56:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 21:56:37 +0100 |
| commit | 54080b3b7bb6e422549a8f1dae1519ba5afe8ca6 (patch) | |
| tree | 06960269ce08ec014ec68d5c3550a4c77fd0ecb1 /pkgs/development | |
| parent | 8e90e69e0e97257bbe4940681e7a68cf79ac73bc (diff) | |
| parent | 7343dde6d33981ff6ceb1d3d374aa83d414ae3ed (diff) | |
Merge pull request #315313 from paparodeo/xqilla-14
xqilla,dbxml: fix clang and darwin builds
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/dbxml/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/xqilla/default.nix | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index b6dcf908c4f92..f50b53d47e05c 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { "--with-berkeleydb=${db62.out}" "--with-xerces=${xercesc}" "--with-xqilla=${xqilla}" + # code uses register storage specifier + "CXXFLAGS=-std=c++14" ]; preConfigure = '' diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix index 352f41f47bb49..ad568f42673c9 100644 --- a/pkgs/development/tools/xqilla/default.nix +++ b/pkgs/development/tools/xqilla/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, xercesc }: +{ lib, stdenv, fetchurl, fetchpatch, darwin, xercesc }: stdenv.mkDerivation rec { pname = "xqilla"; @@ -17,7 +17,18 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--with-xerces=${xercesc}" ]; + configureFlags = [ + "--with-xerces=${xercesc}" + # code uses register storage specifier + "CXXFLAGS=-std=c++14" + ]; + + buildInputs = [ + xercesc + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreServices + SystemConfiguration + ]); meta = with lib; { description = "An XQuery and XPath 2 library and command line utility written in C++, implemented on top of the Xerces-C library"; |