From 8bef8179aff9267bd206fe17a287e1bb5b03d1ca Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Mon, 10 Nov 2025 05:33:59 +0000 Subject: [PATCH] ubpm: migrate to pkgs/by-name --- .../ub/ubpm/package.nix} | 22 +++++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 16 deletions(-) rename pkgs/{applications/misc/ubpm/default.nix => by-name/ub/ubpm/package.nix} (84%) diff --git a/pkgs/applications/misc/ubpm/default.nix b/pkgs/by-name/ub/ubpm/package.nix similarity index 84% rename from pkgs/applications/misc/ubpm/default.nix rename to pkgs/by-name/ub/ubpm/package.nix index 2cb89b59c296..04ef9da72b77 100644 --- a/pkgs/applications/misc/ubpm/default.nix +++ b/pkgs/by-name/ub/ubpm/package.nix @@ -2,13 +2,7 @@ stdenv, lib, fetchFromGitea, - qmake, - qttools, - qtbase, - qtserialport, - qtconnectivity, - qtcharts, - wrapQtAppsHook, + libsForQt5, fetchpatch, }: @@ -41,19 +35,19 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - qmake - qttools - wrapQtAppsHook + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; # *.so plugins are being wrapped automatically which breaks them dontWrapQtApps = true; buildInputs = [ - qtbase - qtserialport - qtconnectivity - qtcharts + libsForQt5.qtbase + libsForQt5.qtserialport + libsForQt5.qtconnectivity + libsForQt5.qtcharts ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a4b3203986a..fe99587ed716 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4008,8 +4008,6 @@ with pkgs; python3Packages.callPackage ../applications/misc/twitch-chat-downloader { }; - ubpm = libsForQt5.callPackage ../applications/misc/ubpm { }; - uftraceFull = uftrace.override { withLuaJIT = true; withPython = true;