From ad6906feb7db94531a3cc3077be07ef544bb7352 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 20 Apr 2023 23:18:24 -0500 Subject: [PATCH 1/3] doxygen: enable sqlite3 output --- .../tools/documentation/doxygen/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 1b128a51d0b..2790c334175 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -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 { pname = "doxygen"; @@ -19,12 +30,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libiconv ] + ++ lib.optionals withSqlite [ sqlite ] ++ lib.optionals (qt5 != null) (with qt5; [ qtbase wrapQtAppsHook ]) ++ lib.optionals stdenv.isDarwin [ CoreServices ]; - cmakeFlags = - [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++ - lib.optional (qt5 != null) "-Dbuild_wizard=YES"; + cmakeFlags = [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] + ++ lib.optional withSqlite "-Duse_sqlite3=ON" + ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; From a6a8834043fd746f69ae0f4693d8e6857269be0c Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Fri, 21 Apr 2023 19:49:08 -0500 Subject: [PATCH 2/3] doxygen: use apple_sdk_11_0 I tried to build the upstream's master branch and am getting failures on missing utimensat on intel-based mac. (Basically just preparing for the next release, which I imagine is nigh.) --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9cae64ed9a..81ad6b915ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17982,9 +17982,9 @@ with pkgs; 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; - inherit (darwin.apple_sdk.frameworks) CoreServices; + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; }; doxygen_gui = lowPrio (doxygen.override { inherit qt5; }); From e5c113e3e79047f1f60a551cbf28c2ca85853a05 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Fri, 21 Apr 2023 19:57:34 -0500 Subject: [PATCH 3/3] doxygen: add output for examples --- pkgs/development/tools/documentation/doxygen/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 2790c334175..29f4fcfd4ae 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -41,6 +41,12 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = 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 = { license = lib.licenses.gpl2Plus; homepage = "https://www.doxygen.nl/";