From ffae7002b320b3aca97ec34390d0541a2e631c5a Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Sun, 8 Jan 2023 00:57:22 -0700
Subject: [PATCH] Explicitly specify the cranes to build

---
 crane.nix   | 4 +++-
 package.nix | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crane.nix b/crane.nix
index 30f89f9..869cae5 100644
--- a/crane.nix
+++ b/crane.nix
@@ -66,6 +66,8 @@ let
     # See comment in `attic-tests`
     doCheck = false;
 
+    cargoExtraArgs = "-p attic-client -p attic-server";
+
     postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
       if [[ -f $out/bin/attic ]]; then
         installShellCompletion --cmd attic \
@@ -78,7 +80,7 @@ let
 
   # Client-only package.
   attic-client = attic.overrideAttrs (old: {
-    cargoExtraArgs = (old.cargoExtraArgs or "") + " -p attic-client";
+    cargoExtraArgs = " -p attic-client";
   });
 
   # Server-only package with fat LTO enabled.
diff --git a/package.nix b/package.nix
index 5ccc0d6..3710525 100644
--- a/package.nix
+++ b/package.nix
@@ -15,7 +15,7 @@
 , clientOnly ? false
 
 # Only build certain crates
-, crates ? if clientOnly then [ "attic-client" ] else []
+, crates ? if clientOnly then [ "attic-client" ] else [ "attic-client" "attic-server" ]
 }:
 
 let