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 37b96d2654bc..fde10b631cc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6498,10 +6498,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 { };