From 242296771aab63e3ccc442162b8a49afede30662 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 4 Nov 2025 08:55:54 +0100 Subject: [PATCH] doxygen_gui: build against qt6 qt5 is on the way out. Upstream doxygen defaults to qt6 since 1.15.0 [1]. We should adjust our nix packaging accordingly. This does break the override interface sability. However, we never really guaranteed override stability, so this should be fine even during freeze month. [1] https://www.doxygen.nl/manual/changelog.html --- .../tools/documentation/doxygen/default.nix | 18 ++++++++---------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 801e6592d030..c0a65e96495a 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -6,7 +6,7 @@ python3, flex, bison, - qt5, + qt6, libiconv, spdlog, fmt, @@ -45,20 +45,18 @@ stdenv.mkDerivation (finalAttrs: { fmt sqlite ] - ++ lib.optionals (qt5 != null) ( - with qt5; - [ - qtbase - wrapQtAppsHook - ] - ); + ++ lib.optionals (qt6 != null) [ + qt6.qtbase + qt6.wrapQtAppsHook + qt6.qtsvg + ]; cmakeFlags = [ "-Duse_sys_spdlog=ON" "-Duse_sys_fmt=ON" "-Duse_sys_sqlite3=ON" ] - ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES"; + ++ lib.optional (qt6 != null) "-Dbuild_wizard=YES"; # put examples in an output so people/tools can test against them outputs = [ @@ -85,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: { off-line reference manual (in LaTeX) from a set of documented source files. ''; - platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix; + platforms = if qt6 != null then lib.platforms.linux else lib.platforms.unix; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe5ec8f968c8..ec60a1c848c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6495,10 +6495,10 @@ with pkgs; dot2tex = with python3.pkgs; toPythonApplication dot2tex; doxygen = callPackage ../development/tools/documentation/doxygen { - qt5 = null; + qt6 = null; }; - doxygen_gui = lowPrio (doxygen.override { inherit qt5; }); + doxygen_gui = lowPrio (doxygen.override { inherit qt6; }); drake = callPackage ../development/tools/build-managers/drake { };