From a3140b5bc8d08da6f759a88aef1826b9f2aa5465 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Jul 2024 20:28:07 +0200
Subject: [PATCH] nmapsi4: move to by-name

---
 .../nmap/qt.nix => by-name/nm/nmapsi4/package.nix}       | 9 +++------
 pkgs/top-level/all-packages.nix                          | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)
 rename pkgs/{tools/security/nmap/qt.nix => by-name/nm/nmapsi4/package.nix} (89%)

diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/by-name/nm/nmapsi4/package.nix
similarity index 89%
rename from pkgs/tools/security/nmap/qt.nix
rename to pkgs/by-name/nm/nmapsi4/package.nix
index 956649088ff3..9faf7eb46e02 100644
--- a/pkgs/tools/security/nmap/qt.nix
+++ b/pkgs/by-name/nm/nmapsi4/package.nix
@@ -2,12 +2,9 @@
 , fetchFromGitHub
 , cmake
 , pkg-config
-, wrapQtAppsHook
 , dnsutils
 , nmap
-, qtbase
-, qtscript
-, qtwebengine
+, libsForQt5
 }:
 
 stdenv.mkDerivation rec {
@@ -21,9 +18,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
+  nativeBuildInputs = [ cmake pkg-config libsForQt5.wrapQtAppsHook ];
 
-  buildInputs = [ qtbase qtscript qtwebengine ];
+  buildInputs = with libsForQt5; [ qtbase qtscript qtwebengine ];
 
   postPatch = ''
     substituteInPlace src/platform/digmanager.cpp \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54f6c87c243f..b1bd1f2b7422 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10927,8 +10927,6 @@ with pkgs;
 
   nmap-formatter = callPackage ../tools/security/nmap-formatter { };
 
-  nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };
-
   noise-repellent = callPackage ../applications/audio/noise-repellent { };
 
   noisetorch = callPackage ../applications/audio/noisetorch { };