diff --git a/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.c b/pkgs/by-name/qe/qemu/binfmt-p-wrapper.c
similarity index 100%
rename from pkgs/applications/virtualization/qemu/binfmt-p-wrapper.c
rename to pkgs/by-name/qe/qemu/binfmt-p-wrapper.c
diff --git a/pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix b/pkgs/by-name/qe/qemu/binfmt-p-wrapper.nix
similarity index 100%
rename from pkgs/applications/virtualization/qemu/binfmt-p-wrapper.nix
rename to pkgs/by-name/qe/qemu/binfmt-p-wrapper.nix
diff --git a/pkgs/applications/virtualization/qemu/canokey-qemu-memcpy.patch b/pkgs/by-name/qe/qemu/canokey-qemu-memcpy.patch
similarity index 100%
rename from pkgs/applications/virtualization/qemu/canokey-qemu-memcpy.patch
rename to pkgs/by-name/qe/qemu/canokey-qemu-memcpy.patch
diff --git a/pkgs/applications/virtualization/qemu/canokey-qemu.nix b/pkgs/by-name/qe/qemu/canokey-qemu.nix
similarity index 100%
rename from pkgs/applications/virtualization/qemu/canokey-qemu.nix
rename to pkgs/by-name/qe/qemu/canokey-qemu.nix
diff --git a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch b/pkgs/by-name/qe/qemu/fix-qemu-ga.patch
similarity index 100%
rename from pkgs/applications/virtualization/qemu/fix-qemu-ga.patch
rename to pkgs/by-name/qe/qemu/fix-qemu-ga.patch
diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/by-name/qe/qemu/force-uid0-on-9p.patch
similarity index 100%
rename from pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
rename to pkgs/by-name/qe/qemu/force-uid0-on-9p.patch
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/by-name/qe/qemu/package.nix
similarity index 99%
rename from pkgs/applications/virtualization/qemu/default.nix
rename to pkgs/by-name/qe/qemu/package.nix
index 45af6fe007a7..1b544c0dbb9a 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/by-name/qe/qemu/package.nix
@@ -23,7 +23,6 @@
   ninja,
   meson,
   perl,
-  sigtool,
   makeWrapper,
   removeReferencesTo,
   attr,
@@ -32,6 +31,7 @@
   socat,
   libslirp,
   libcbor,
+  darwin,
   guestAgentSupport ?
     (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal,
   numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal,
@@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals hexagonSupport [ glib ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    sigtool
+    darwin.sigtool
   ]
   ++ lib.optionals (!userOnly) [ dtc ];
 
diff --git a/pkgs/applications/virtualization/qemu/skip-macos-icon.patch b/pkgs/by-name/qe/qemu/skip-macos-icon.patch
similarity index 100%
rename from pkgs/applications/virtualization/qemu/skip-macos-icon.patch
rename to pkgs/by-name/qe/qemu/skip-macos-icon.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b328b7bbf56..b6c58ad80689 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10317,10 +10317,6 @@ with pkgs;
 
   eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { };
 
-  qemu = callPackage ../applications/virtualization/qemu {
-    inherit (darwin) sigtool;
-  };
-
   qemu-python-utils = python3Packages.toPythonApplication (
     python3Packages.qemu.override {
       fuseSupport = true;
@@ -10339,7 +10335,7 @@ with pkgs;
 
   canokey-qemu = callPackage ../applications/virtualization/qemu/canokey-qemu.nix { };
 
-  wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };
+  wrapQemuBinfmtP = callPackage ../by-name/qe/qemu/binfmt-p-wrapper.nix { };
 
   qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };