From e2ad57d487acab81377249ec17e389623aa0e6bd Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Fri, 29 Aug 2025 22:06:42 +0300
Subject: [PATCH] qolibri: move to by-name, switch to Qt6

---
 .../qo/qolibri/package.nix}                    | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  2 --
 2 files changed, 9 insertions(+), 11 deletions(-)
 rename pkgs/{applications/misc/qolibri/default.nix => by-name/qo/qolibri/package.nix} (90%)

diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/by-name/qo/qolibri/package.nix
similarity index 90%
rename from pkgs/applications/misc/qolibri/default.nix
rename to pkgs/by-name/qo/qolibri/package.nix
index 636344ebffd6..0d8e6088b5ba 100644
--- a/pkgs/applications/misc/qolibri/default.nix
+++ b/pkgs/by-name/qo/qolibri/package.nix
@@ -1,12 +1,10 @@
 {
-  stdenv,
-  lib,
-  fetchFromGitHub,
   cmake,
+  fetchFromGitHub,
+  lib,
   ninja,
-  qttools,
-  qtwebengine,
-  wrapQtAppsHook,
+  qt6Packages,
+  stdenv,
 }:
 stdenv.mkDerivation {
   pname = "qolibri";
@@ -22,12 +20,14 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     ninja
-    qttools
-    wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtwebengine
+    qt6Packages.qt5compat
+    qt6Packages.qtmultimedia
+    qt6Packages.qtwebengine
   ];
 
   cmakeFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0f5f04f3b41..8d60a0a552f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8828,8 +8828,6 @@ with pkgs;
     inherit (lomiri) cmake-extras;
   };
 
-  qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
-
   quarto = callPackage ../development/libraries/quarto { };
 
   quartoMinimal = callPackage ../development/libraries/quarto {