From 152a0683e25c16f0ef57ee20a723755748b696e3 Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Wed, 12 Jul 2023 09:18:30 -0700
Subject: [PATCH] github: enable the watchman feature in pre-built binaries

---
 .github/workflows/release.yml | 2 +-
 Cargo.toml                    | 1 +
 flake.nix                     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 537f0182b..8adebe133 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -43,7 +43,7 @@ jobs:
         toolchain: stable
         target: ${{ matrix.target }}
     - name: Build release binary
-      run: cargo build --target ${{ matrix.target }} --verbose --release --features vendored-openssl
+      run: cargo build --target ${{ matrix.target }} --verbose --release --features packaging,vendored-openssl
     - name: Build archive
       shell: bash
       run: |
diff --git a/Cargo.toml b/Cargo.toml
index 50bc4b967..c3969b4c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,6 +77,7 @@ testutils = { path = "lib/testutils" }
 [features]
 default = []
 bench = ["criterion"]
+packaging = ["watchman"]
 vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
 watchman = ["jj-lib/watchman"]
 
diff --git a/flake.nix b/flake.nix
index c6181a274..f35d31ab4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,7 +40,7 @@
           pname = "jujutsu";
           version = "unstable-${self.shortRev or "dirty"}";
           buildNoDefaultFeatures = true;
-          buildFeatures = [ "watchman" ];
+          buildFeatures = [ "packaging" ];
           cargoBuildFlags = ["--bin" "jj"]; # don't build and install the fake editors
           useNextest = true;
           src = filterSrc ./. [