wpa_supplicant_gui: migrate to by-name

2026-05-29 10:26:31 +02:00
parent 6dd66956a0
commit 89f298ca50
2 changed files with 7 additions and 8 deletions
@@ -1,11 +1,9 @@
 {
  lib,
  stdenv,
-  qtbase,
-  qmake,
+  qt5,
  inkscape,
  imagemagick,
-  wrapQtAppsHook,
  wpa_supplicant,
 }:

@@ -13,12 +11,15 @@ stdenv.mkDerivation {
  pname = "wpa_gui";
  inherit (wpa_supplicant) version src patches;

-  buildInputs = [ qtbase ];
+  buildInputs = [
+    qt5.qtbase
+  ];
+
  nativeBuildInputs = [
-    qmake
+    qt5.qmake
    inkscape
    imagemagick
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
  ];

  postPatch = ''
@@ -8661,8 +8661,6 @@ with pkgs;

  wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };

-  wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
-
  inherit
    ({
      zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix {