From d27ffb570609bd8bf692ce6ee278c4a380d21154 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:01:35 +0200 Subject: [PATCH] qtwirediff: move to by-name --- .../qt/qtwirediff/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/networking/sniffers/qtwirediff/default.nix => by-name/qt/qtwirediff/package.nix} (92%) diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/by-name/qt/qtwirediff/package.nix similarity index 92% rename from pkgs/applications/networking/sniffers/qtwirediff/default.nix rename to pkgs/by-name/qt/qtwirediff/package.nix index f5be6f968381..c042a560e7d8 100644 --- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix +++ b/pkgs/by-name/qt/qtwirediff/package.nix @@ -2,10 +2,7 @@ lib, stdenv, fetchFromGitHub, - qtbase, - qmake, - qtwayland, - wrapQtAppsHook, + qt6, wireshark-cli, }: @@ -21,15 +18,15 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + qt6.qmake + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase + qt6.qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland + qt6.qtwayland ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28e8a7fe7623..97b383917ba1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9839,8 +9839,6 @@ with pkgs; fftw = fftwSinglePrec; }; - qtwirediff = qt6Packages.callPackage ../applications/networking/sniffers/qtwirediff { }; - tshark = wireshark-cli; wireshark-cli = wireshark.override { withQt = false; };