diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/by-name/kr/krunvm/package.nix
similarity index 88%
rename from pkgs/applications/virtualization/krunvm/default.nix
rename to pkgs/by-name/kr/krunvm/package.nix
index 8dd4fc569e42..70b8dd4114f0 100644
--- a/pkgs/applications/virtualization/krunvm/default.nix
+++ b/pkgs/by-name/kr/krunvm/package.nix
@@ -7,29 +7,32 @@
   buildah,
   buildah-unwrapped,
   cargo,
+  darwin,
   libiconv,
   libkrun,
   makeWrapper,
   rustc,
-  sigtool,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "krunvm";
   version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "libkrun";
     repo = "krunvm";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-peOaPivQKOwioh5skPNFiA3ptHv9pSsnjpy43cms8O8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
+    inherit (finalAttrs) src;
     hash = "sha256-MRcQ0Vnd3PJqE2q981JpXPjwMUKT4t+RcOvzWptK7PQ=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     rustPlatform.cargoSetupHook
     cargo
@@ -37,7 +40,7 @@ stdenv.mkDerivation rec {
     asciidoctor
     makeWrapper
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
 
   buildInputs = [
     libkrun
@@ -77,4 +80,4 @@ stdenv.mkDerivation rec {
     platforms = libkrun.meta.platforms;
     mainProgram = "krunvm";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eae9b2028a9..075a6b9b2a72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2360,10 +2360,6 @@ with pkgs;
 
   keybase-gui = callPackage ../tools/security/keybase/gui.nix { };
 
-  krunvm = callPackage ../applications/virtualization/krunvm {
-    inherit (darwin) sigtool;
-  };
-
   limine-full = limine.override { enableAll = true; };
 
   logstash7 = callPackage ../tools/misc/logstash/7.x.nix {