qtwirediff: move to by-name

2026-01-31 23:01:35 +02:00
parent 74297e1ac8
commit d27ffb5706
2 changed files with 5 additions and 10 deletions
@@ -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 = ''
@@ -9839,8 +9839,6 @@ with pkgs;
    fftw = fftwSinglePrec;
  };

-  qtwirediff = qt6Packages.callPackage ../applications/networking/sniffers/qtwirediff { };
-
  tshark = wireshark-cli;
  wireshark-cli = wireshark.override { withQt = false; };