Merge #227485: doxygen: enable sqlite3 output

...into staging
This commit is contained in:
Vladimír Čunát 2023-05-10 08:38:38 +02:00
commit ae8dfea880
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 24 additions and 6 deletions

View file

@ -1,4 +1,15 @@
{ lib, stdenv, cmake, fetchFromGitHub, python3, flex, bison, qt5, CoreServices, libiconv }: { lib
, stdenv
, cmake
, fetchFromGitHub
, python3
, flex
, bison
, qt5
, CoreServices
, libiconv
, withSqlite ? true, sqlite
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "doxygen"; pname = "doxygen";
@ -19,16 +30,23 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ libiconv ] buildInputs = [ libiconv ]
++ lib.optionals withSqlite [ sqlite ]
++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ])
++ lib.optionals stdenv.isDarwin [ CoreServices ]; ++ lib.optionals stdenv.isDarwin [ CoreServices ];
cmakeFlags = cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ]
[ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++ ++ lib.optional withSqlite "-Duse_sqlite3=ON"
lib.optional (qt5 != null) "-Dbuild_wizard=YES"; ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES";
env.NIX_CFLAGS_COMPILE = env.NIX_CFLAGS_COMPILE =
lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
# put examples in an output so people/tools can test against them
outputs = [ "out" "examples" ];
postInstall = ''
cp -r ../examples $examples
'';
meta = { meta = {
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
homepage = "https://www.doxygen.nl/"; homepage = "https://www.doxygen.nl/";

View file

@ -18123,9 +18123,9 @@ with pkgs;
dot2tex = with python3.pkgs; toPythonApplication dot2tex; dot2tex = with python3.pkgs; toPythonApplication dot2tex;
doxygen = callPackage ../development/tools/documentation/doxygen { doxygen = darwin.apple_sdk_11_0.callPackage ../development/tools/documentation/doxygen {
qt5 = null; qt5 = null;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk_11_0.frameworks) CoreServices;
}; };
doxygen_gui = lowPrio (doxygen.override { inherit qt5; }); doxygen_gui = lowPrio (doxygen.override { inherit qt5; });