From 6c462a529845ccdbe690c738c16d620772455a88 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 3 Aug 2023 17:01:56 +0200 Subject: [PATCH] qtstyleplugin-kvantum: fix loading builtin themes on Qt 6 Signed-off-by: Sefa Eyeoglu --- .../libraries/qtstyleplugin-kvantum/default.nix | 8 ++++++++ pkgs/top-level/qt6-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 15cb346d5b18..86408fcffacb 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -13,6 +13,8 @@ , qttools , wrapQtAppsHook , gitUpdater + +, qt5Kvantum ? null }: let isQt6 = lib.versionAtLeast qtbase.version "6"; @@ -59,6 +61,12 @@ stdenv.mkDerivation rec { --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; + postInstall = lib.optionalString isQt6 '' + # make default Kvantum themes available for Qt 6 apps + mkdir -p "$out/share" + ln -s "${qt5Kvantum}/share/Kvantum" "$out/share/Kvantum" + ''; + passthru.updateScript = gitUpdater { rev-prefix = "V"; }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 4fda684b54d6..83e6ab872e07 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -41,7 +41,9 @@ in qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; - qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { }; + qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { + qt5Kvantum = pkgs.libsForQt5.qtstyleplugin-kvantum; + }; quazip = callPackage ../development/libraries/quazip { };