diff --git a/pkgs/by-name/xc/xc/package.nix b/pkgs/by-name/xc/xc/package.nix
index d38e8070f544..0fd8c4647601 100644
--- a/pkgs/by-name/xc/xc/package.nix
+++ b/pkgs/by-name/xc/xc/package.nix
@@ -6,26 +6,31 @@
   versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "xc";
-  version = "0.8.5";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
     owner = "joerdav";
     repo = "xc";
-    tag = "v${version}";
-    sha256 = "sha256-eaFHK7VsfLSgSJehv4urxq8qMPT+zzs2tRypz4q+MLc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Q17ldwHp1Wp/u0BkUZiA1pRJaFpo/5iDW011k9qkIEA=";
   };
 
   vendorHash = "sha256-EbIuktQ2rExa2DawyCamTrKRC1yXXMleRB8/pcKFY5c=";
 
+  subPackages = [ "cmd/xc" ];
+
   ldflags = [
     "-s"
     "-w"
-    "-X=main.version=${version}"
+    "-X=main.version=${finalAttrs.version}"
   ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
+
+  versionCheckProgramArg = "-version";
+
   doInstallCheck = true;
   postInstallCheck = ''
     cp ${./example.md} example.md
@@ -42,11 +47,11 @@ buildGoModule rec {
     description = "Markdown defined task runner";
     mainProgram = "xc";
     homepage = "https://xcfile.dev/";
-    changelog = "https://github.com/joerdav/xc/releases/tag/${src.tag}";
+    changelog = "https://github.com/joerdav/xc/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       figsoda
       joerdav
     ];
   };
-}
+})