From 84cf4f711664d3e4a2fdaf63fc99e2f1755ca579 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Sat, 11 Oct 2025 11:55:03 +0200 Subject: [PATCH] openrgb: build with Qt 6 --- pkgs/by-name/op/openrgb/package.nix | 15 +++++++++++---- pkgs/by-name/op/openrgb/qlist-include.patch | 16 ++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/op/openrgb/qlist-include.patch diff --git a/pkgs/by-name/op/openrgb/package.nix b/pkgs/by-name/op/openrgb/package.nix index ca7a1e2afc0d..ce3a74baa29f 100644 --- a/pkgs/by-name/op/openrgb/package.nix +++ b/pkgs/by-name/op/openrgb/package.nix @@ -2,13 +2,13 @@ lib, stdenv, fetchFromGitLab, - libsForQt5, libusb1, hidapi, pkg-config, coreutils, mbedtls, symlinkJoin, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { @@ -22,21 +22,24 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; }; + patches = [ + ./qlist-include.patch + ]; + nativeBuildInputs = [ pkg-config ] - ++ (with libsForQt5; [ + ++ (with kdePackages; [ qmake wrapQtAppsHook ]); buildInputs = [ - libusb1 hidapi mbedtls ] - ++ (with libsForQt5; [ + ++ (with kdePackages; [ qtbase qttools qtwayland @@ -57,6 +60,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstallCheck ''; + qmakeFlags = [ + "QT_TOOL.lrelease.binary=${lib.getDev kdePackages.qttools}/bin/lrelease" + ]; + passthru.withPlugins = plugins: let diff --git a/pkgs/by-name/op/openrgb/qlist-include.patch b/pkgs/by-name/op/openrgb/qlist-include.patch new file mode 100644 index 000000000000..52fb6772cf71 --- /dev/null +++ b/pkgs/by-name/op/openrgb/qlist-include.patch @@ -0,0 +1,16 @@ +Commit ID: 2fa7aa0ec87d9878293033db0e86bb62cddc47df +Change ID: mvrytuwvnokxyvmuworxptmtqpqpppxq +Author : Marie Ramlow (2025-10-11 12:10:21) +Committer: Marie Ramlow (2025-10-11 12:17:20) + + OpenRGBFont: add QList include + +diff --git a/qt/OpenRGBFont.cpp b/qt/OpenRGBFont.cpp +index 628bd35281..db1ab5fb76 100644 +--- a/qt/OpenRGBFont.cpp ++++ b/qt/OpenRGBFont.cpp +@@ -1,3 +1,4 @@ ++#include + #include "OpenRGBFont.h" + #include +