Unverified Commit addb1cf9 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #315442 from NixOS/backport-315313-to-release-24.05 

[Backport release-24.05] xqilla,dbxml: fix clang and darwin builds
parents 4d997dbc 1d71d996

pkgs/development/libraries/dbxml/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/development/tools/xqilla/default.nix

+13 −2
Original line number Diff line number Diff line 
{ 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";