[Backport release-25.05] qolibri: move to by-name, switch to Qt6 (#439084)

This commit is contained in:
Azat Bahawi
2025-09-01 14:23:11 +03:00
committed by GitHub
2 changed files with 9 additions and 11 deletions

View File

@@ -1,12 +1,10 @@
{
stdenv,
lib,
fetchFromGitHub,
cmake,
fetchFromGitHub,
lib,
ninja,
qttools,
qtwebengine,
wrapQtAppsHook,
qt6Packages,
stdenv,
}:
let
@@ -32,12 +30,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [
cmake
ninja
qttools
wrapQtAppsHook
qt6Packages.qttools
qt6Packages.wrapQtAppsHook
];
buildInputs = [
qtwebengine
qt6Packages.qt5compat
qt6Packages.qtmultimedia
qt6Packages.qtwebengine
];
cmakeFlags = [

View File

@@ -9453,8 +9453,6 @@ with pkgs;
inherit (lomiri) cmake-extras;
};
qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
quarto = callPackage ../development/libraries/quarto { };
quartoMinimal = callPackage ../development/libraries/quarto {