1 files changed, 15 insertions, 7 deletions

diff --git a/nix/notmuch-tcp.nix b/nix/notmuch-tcp.nix
index 59d2e39..1a1947b 100644
--- a/nix/notmuch-tcp.nix
+++ b/nix/notmuch-tcp.nix
@@ -1,22 +1,30 @@
 { stdenv
-, zsh, socat, nettools, coreutils
+, python38
 }:
 
 stdenv.mkDerivation rec {
   pname = "notmuch-tcp";
-  version = "0.1";
-  src = ../notmuch-tcp;
+  version = "1.0";
+  src = [../notmuch-tcp-client ../notmuch-tcp-server];
 
-  phases = [ "buildPhase" "installPhase" ];
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
 
-  inherit zsh socat nettools coreutils;
+  python = python38;
+
+  unpackPhase = ''
+    for srcFile in $src; do
+      cp $srcFile $(stripHash $srcFile)
+    done
+  '';
 
   buildPhase = ''
-    substituteAll $src notmuch-tcp
+    substituteAllInPlace notmuch-tcp-client
+    substituteAllInPlace notmuch-tcp-server
   '';
 
   installPhase = ''
     install -m 0755 -D -t $out/bin \
-      notmuch-tcp
+      notmuch-tcp-client notmuch-tcp-server
+    ln -s notmuch-tcp-client $out/bin/notmuch-tcp
   '';
 }