From edcb807891c714e254cd3440d9579f80972060ff Mon Sep 17 00:00:00 2001 From: Aras14HD Date: Sun, 31 Aug 2025 15:06:57 +0200 Subject: [PATCH] kiwix: update qt5 to qt6 The current qt5 version of qtwebengine (5.15.19) has been marked insecure. As kiwix supports qt6 switching to that is the simplest solution. --- pkgs/applications/misc/kiwix/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index bb52de44c15d..4f05aa627d64 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,6 +1,6 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, nix-update-script, libkiwix, @@ -10,10 +10,11 @@ qtwebengine, qtsvg, qtimageformats, + wrapQtAppsHook, aria2, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "kiwix"; version = "2.4.1"; @@ -27,6 +28,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkg-config + wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f89c99011e65..ca3b7e218e43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12125,7 +12125,7 @@ with pkgs; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; + kiwix = qt6Packages.callPackage ../applications/misc/kiwix { }; kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { };