From 7faebac97e2fffecd8b8de1fbdae6f9cb9a335e7 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:27:48 +0000
Subject: [PATCH] digitalbitbox: migrate to pkgs/by-name

---
 .../di/digitalbitbox/package.nix}             | 31 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 19 deletions(-)
 rename pkgs/{applications/misc/digitalbitbox/default.nix => by-name/di/digitalbitbox/package.nix} (89%)

diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/by-name/di/digitalbitbox/package.nix
similarity index 89%
rename from pkgs/applications/misc/digitalbitbox/default.nix
rename to pkgs/by-name/di/digitalbitbox/package.nix
index fd805af2cdea..f9115ec59ba9 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/by-name/di/digitalbitbox/package.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   autoreconfHook,
   curl,
@@ -7,15 +7,12 @@
   git,
   libevent,
   libtool,
+  libsForQt5,
   qrencode,
   udev,
   libusb1,
   makeWrapper,
   pkg-config,
-  qtbase,
-  qttools,
-  qtwebsockets,
-  qtmultimedia,
   udevRule51 ? ''
     SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402"
   '',
@@ -49,7 +46,7 @@
 let
   copyUdevRuleToOutput = name: rule: "cp ${writeText name rule} $out/etc/udev/rules.d/${name}";
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "digitalbitbox";
   version = "3.0.0";
 
@@ -71,8 +68,9 @@ mkDerivation rec {
     git
     makeWrapper
     pkg-config
-    qttools
+    libsForQt5.qttools
     udevCheckHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -81,18 +79,17 @@ mkDerivation rec {
     udev
     libusb1
     qrencode
-
-    qtbase
-    qtwebsockets
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtwebsockets
+    libsForQt5.qtmultimedia
   ];
 
-  LUPDATE = "${qttools.dev}/bin/lupdate";
-  LRELEASE = "${qttools.dev}/bin/lrelease";
-  MOC = "${qtbase.dev}/bin/moc";
-  QTDIR = qtbase.dev;
-  RCC = "${qtbase.dev}/bin/rcc";
-  UIC = "${qtbase.dev}/bin/uic";
+  LUPDATE = "${libsForQt5.qttools.dev}/bin/lupdate";
+  LRELEASE = "${libsForQt5.qttools.dev}/bin/lrelease";
+  MOC = "${libsForQt5.qtbase.dev}/bin/moc";
+  QTDIR = libsForQt5.qtbase.dev;
+  RCC = "${libsForQt5.qtbase.dev}/bin/rcc";
+  UIC = "${libsForQt5.qtbase.dev}/bin/uic";
 
   configureFlags = [
     "--enable-libusb"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4226903662bf..90710a5cb6ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -403,8 +403,6 @@ with pkgs;
     name = "die-hook";
   } ../build-support/setup-hooks/die.sh;
 
-  digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { };
-
   devShellTools = callPackage ../build-support/dev-shell-tools { };
 
   dockerTools = callPackage ../build-support/docker {