From 46d1b75608a3ebafdeb2fcc9b5195a2bba962bce Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 4 Apr 2026 08:34:48 -0500 Subject: [PATCH] flirc: migrate to by-name --- .../video => by-name/fl}/flirc/99-flirc.rules | 0 .../flirc/default.nix => by-name/fl/flirc/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 insertions(+), 10 deletions(-) rename pkgs/{applications/video => by-name/fl}/flirc/99-flirc.rules (100%) rename pkgs/{applications/video/flirc/default.nix => by-name/fl/flirc/package.nix} (92%) diff --git a/pkgs/applications/video/flirc/99-flirc.rules b/pkgs/by-name/fl/flirc/99-flirc.rules similarity index 100% rename from pkgs/applications/video/flirc/99-flirc.rules rename to pkgs/by-name/fl/flirc/99-flirc.rules diff --git a/pkgs/applications/video/flirc/default.nix b/pkgs/by-name/fl/flirc/package.nix similarity index 92% rename from pkgs/applications/video/flirc/default.nix rename to pkgs/by-name/fl/flirc/package.nix index 5de7e4e46830..8cdba0579874 100644 --- a/pkgs/applications/video/flirc/default.nix +++ b/pkgs/by-name/fl/flirc/package.nix @@ -3,11 +3,9 @@ stdenv, fetchurl, autoPatchelfHook, - wrapQtAppsHook, hidapi, readline, - qtsvg, - qtxmlpatterns, + libsForQt5, }: stdenv.mkDerivation { @@ -21,14 +19,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ hidapi readline - qtsvg - qtxmlpatterns + libsForQt5.qtsvg + libsForQt5.qtxmlpatterns ]; dontConfigure = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10e58b8c0268..c3aab3ce5a6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1517,10 +1517,6 @@ with pkgs; libfx2 = with python3Packages; toPythonApplication fx2; - flirc = libsForQt5.callPackage ../applications/video/flirc { - readline = readline70; - }; - foxdot = with python3Packages; toPythonApplication foxdot; fluffychat-web = fluffychat.override { targetFlutterPlatform = "web"; };