diff --git a/hosts/sam-4screen-desktop/configuration.nix b/hosts/sam-4screen-desktop/configuration.nix
index abca1fb..8e6cf02 100644
--- a/hosts/sam-4screen-desktop/configuration.nix
+++ b/hosts/sam-4screen-desktop/configuration.nix
@@ -328,7 +328,7 @@ fonts.packages = with pkgs; [
   # Minimal system packages needed for the session and core usability
   environment.systemPackages = with pkgs; [
    uv
-  (pkgs.callPackage ../../pkgs/agentpipe-bin.nix { })
+  (pkgs.callPackage ../../pkgs/agentpipe.nix { })
   (pkgs.callPackage ../../pkgs/sidecar-bin.nix { })
    xfce.thunar
    xfce.tumbler
diff --git a/pkgs/agentpipe.nix b/pkgs/agentpipe.nix
new file mode 100644
index 0000000..2df6e74
--- /dev/null
+++ b/pkgs/agentpipe.nix
@@ -0,0 +1,34 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "agentpipe";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "kevinelliott";
+    repo = "agentpipe";
+    rev = "v${version}";
+    hash = lib.fakeHash;
+  };
+
+  vendorHash = lib.fakeHash;
+
+  subPackages = [ "." ];
+
+  # Avoid dynamic linking surprises.
+  CGO_ENABLED = 0;
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = with lib; {
+    description =
+      "CLI/TUI orchestrator for multi-agent conversations between AI CLI tools";
+    homepage = "https://github.com/kevinelliott/agentpipe";
+    license = licenses.mit;
+    mainProgram = "agentpipe";
+    platforms = platforms.linux;
+  };
+}