digitalbitbox: migrate to pkgs/by-name

This commit is contained in:
magicquark
2025-12-09 03:27:48 +00:00
parent 46cf494956
commit 7faebac97e
2 changed files with 14 additions and 19 deletions
@@ -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"
-2
View File
@@ -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 {