From dd5a08689fabed50eeb874979dc2aaa3b3afbb27 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 27 Jan 2025 22:56:40 +0100
Subject: [PATCH] openrgb: move to by-name

---
 .../op/openrgb-plugin-effects/package.nix}             |  8 +++-----
 .../op/openrgb-plugin-hardwaresync/package.nix}        |  8 +++-----
 .../default.nix => by-name/op/openrgb/package.nix}     | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  6 ------
 4 files changed, 10 insertions(+), 22 deletions(-)
 rename pkgs/{applications/misc/openrgb-plugins/effects/default.nix => by-name/op/openrgb-plugin-effects/package.nix} (91%)
 rename pkgs/{applications/misc/openrgb-plugins/hardwaresync/default.nix => by-name/op/openrgb-plugin-hardwaresync/package.nix} (92%)
 rename pkgs/{applications/misc/openrgb/default.nix => by-name/op/openrgb/package.nix} (95%)

diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/by-name/op/openrgb-plugin-effects/package.nix
similarity index 91%
rename from pkgs/applications/misc/openrgb-plugins/effects/default.nix
rename to pkgs/by-name/op/openrgb-plugin-effects/package.nix
index 5723bab1d1c8..70f96877ad79 100644
--- a/pkgs/applications/misc/openrgb-plugins/effects/default.nix
+++ b/pkgs/by-name/op/openrgb-plugin-effects/package.nix
@@ -2,13 +2,11 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  qtbase,
+  libsForQt5,
   openrgb,
   glib,
   openal,
-  qmake,
   pkg-config,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${openrgb.src} OpenRGB
   '';
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with libsForQt5; [
     qmake
     pkg-config
     wrapQtAppsHook
   ];
 
-  buildInputs = [
+  buildInputs = with libsForQt5; [
     qtbase
     glib
     openal
diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix
similarity index 92%
rename from pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix
rename to pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix
index 497da16c10a6..970c0d38a059 100644
--- a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix
+++ b/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix
@@ -2,14 +2,12 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  qtbase,
+  libsForQt5,
   openrgb,
   glib,
   libgtop,
   lm_sensors,
-  qmake,
   pkg-config,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: {
     rm -r dependencies/lhwm-cpp-wrapper
   '';
 
-  buildInputs = [
+  buildInputs = with libsForQt5; [
     qtbase
     glib
     libgtop
     lm_sensors
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with libsForQt5; [
     qmake
     pkg-config
     wrapQtAppsHook
diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/by-name/op/openrgb/package.nix
similarity index 95%
rename from pkgs/applications/misc/openrgb/default.nix
rename to pkgs/by-name/op/openrgb/package.nix
index ac8651b36e37..fa544e48cd93 100644
--- a/pkgs/applications/misc/openrgb/default.nix
+++ b/pkgs/by-name/op/openrgb/package.nix
@@ -2,15 +2,12 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
   libusb1,
   hidapi,
   pkg-config,
   coreutils,
   mbedtls_2,
-  qtbase,
-  qttools,
   symlinkJoin,
   openrgb,
 }:
@@ -26,12 +23,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU=";
   };
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with libsForQt5; [
     qmake
     pkg-config
     wrapQtAppsHook
   ];
-  buildInputs = [
+
+  buildInputs = with libsForQt5; [
     libusb1
     hidapi
     mbedtls_2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66284adf1c94..f834dcaa00b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4484,17 +4484,11 @@ with pkgs;
 
   openrefine = callPackage ../applications/science/misc/openrefine { jdk = jdk17; };
 
-  openrgb = libsForQt5.callPackage ../applications/misc/openrgb { };
-
   openrgb-with-all-plugins = openrgb.withPlugins [
     openrgb-plugin-effects
     openrgb-plugin-hardwaresync
   ];
 
-  openrgb-plugin-effects = libsForQt5.callPackage ../applications/misc/openrgb-plugins/effects { };
-
-  openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { };
-
   toastify = darwin.apple_sdk_11_0.callPackage ../tools/misc/toastify {};
 
   opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {});