Skip to content

Commit c91d3ed

Browse files
authored
openrgb: move to by-name (#377416)
2 parents 2a93bd1 + dd5a086 commit c91d3ed

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
lines changed

pkgs/applications/misc/openrgb-plugins/effects/default.nix renamed to pkgs/by-name/op/openrgb-plugin-effects/package.nix

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
lib,
33
stdenv,
44
fetchFromGitLab,
5-
qtbase,
5+
libsForQt5,
66
openrgb,
77
glib,
88
openal,
9-
qmake,
109
pkg-config,
11-
wrapQtAppsHook,
1210
}:
1311

1412
stdenv.mkDerivation (finalAttrs: {
@@ -29,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
2927
ln -s ${openrgb.src} OpenRGB
3028
'';
3129

32-
nativeBuildInputs = [
30+
nativeBuildInputs = with libsForQt5; [
3331
qmake
3432
pkg-config
3533
wrapQtAppsHook
3634
];
3735

38-
buildInputs = [
36+
buildInputs = with libsForQt5; [
3937
qtbase
4038
glib
4139
openal

pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix renamed to pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
lib,
33
stdenv,
44
fetchFromGitLab,
5-
qtbase,
5+
libsForQt5,
66
openrgb,
77
glib,
88
libgtop,
99
lm_sensors,
10-
qmake,
1110
pkg-config,
12-
wrapQtAppsHook,
1311
}:
1412

1513
stdenv.mkDerivation (finalAttrs: {
@@ -31,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: {
3129
rm -r dependencies/lhwm-cpp-wrapper
3230
'';
3331

34-
buildInputs = [
32+
buildInputs = with libsForQt5; [
3533
qtbase
3634
glib
3735
libgtop
3836
lm_sensors
3937
];
4038

41-
nativeBuildInputs = [
39+
nativeBuildInputs = with libsForQt5; [
4240
qmake
4341
pkg-config
4442
wrapQtAppsHook

pkgs/applications/misc/openrgb/default.nix renamed to pkgs/by-name/op/openrgb/package.nix

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22
lib,
33
stdenv,
44
fetchFromGitLab,
5-
qmake,
6-
wrapQtAppsHook,
5+
libsForQt5,
76
libusb1,
87
hidapi,
98
pkg-config,
109
coreutils,
1110
mbedtls_2,
12-
qtbase,
13-
qttools,
1411
symlinkJoin,
1512
openrgb,
1613
}:
@@ -26,12 +23,13 @@ stdenv.mkDerivation rec {
2623
hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU=";
2724
};
2825

29-
nativeBuildInputs = [
26+
nativeBuildInputs = with libsForQt5; [
3027
qmake
3128
pkg-config
3229
wrapQtAppsHook
3330
];
34-
buildInputs = [
31+
32+
buildInputs = with libsForQt5; [
3533
libusb1
3634
hidapi
3735
mbedtls_2

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4476,17 +4476,11 @@ with pkgs;
44764476

44774477
openrefine = callPackage ../applications/science/misc/openrefine { jdk = jdk17; };
44784478

4479-
openrgb = libsForQt5.callPackage ../applications/misc/openrgb { };
4480-
44814479
openrgb-with-all-plugins = openrgb.withPlugins [
44824480
openrgb-plugin-effects
44834481
openrgb-plugin-hardwaresync
44844482
];
44854483

4486-
openrgb-plugin-effects = libsForQt5.callPackage ../applications/misc/openrgb-plugins/effects { };
4487-
4488-
openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { };
4489-
44904484
toastify = darwin.apple_sdk_11_0.callPackage ../tools/misc/toastify {};
44914485

44924486
opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {});

0 commit comments

Comments
 (0)