Merge pull request #315313 from paparodeo/xqilla-14

xqilla,dbxml: fix clang and darwin builds
This commit is contained in:
Robert Scott 2024-05-28 21:56:37 +01:00 committed by GitHub
commit 54080b3b7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions

View File

@ -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 = ''

View File

@ -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";