Unverified Commit 5d2328eb authored by José Romildo Malaquias's avatar José Romildo Malaquias Committed by GitHub
Browse files

Merge pull request #246977 from Scrumplex/qtstyleplugin-fix-loading-qt6 

qtstyleplugin-kvantum: fix loading builtin themes on Qt 6
parents 0f4255bf 6c462a52

pkgs/development/libraries/qtstyleplugin-kvantum/default.nix

+14 −4
Original line number Diff line number Diff line
@@ -13,10 +13,14 @@ 
, qttools

, wrapQtAppsHook

, gitUpdater

}:



, qt5Kvantum ? null

}:

let

  isQt6 = lib.versionAtLeast qtbase.version "6";

in

stdenv.mkDerivation rec {

  pname = "qtstyleplugin-kvantum";

  pname = "qtstyleplugin-kvantum${lib.optionalString isQt6 "6"}";

  version = "1.0.10";



  src = fetchFromGitHub {
@@ -37,8 +41,8 @@ stdenv.mkDerivation rec { 
    qtsvg

    libX11

    libXext

  ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ]

    ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;

  ] ++ lib.optionals (!isQt6) [ qtx11extras kwindowsystem ]

    ++ lib.optional isQt6 qtwayland;



  sourceRoot = "${src.name}/Kvantum";
@@ -57,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";

  };

pkgs/top-level/qt6-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,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 { };