diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/by-name/wp/wpa_supplicant_gui/package.nix similarity index 88% rename from pkgs/os-specific/linux/wpa_supplicant/gui.nix rename to pkgs/by-name/wp/wpa_supplicant_gui/package.nix index b91d46bca6a6..efb73f3fe865 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/by-name/wp/wpa_supplicant_gui/package.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 312d732b0ba0..e835f5cee1ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {