From 486fa069b37211c1124586490f596747600f698f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 8 Mar 2020 23:12:46 +0100 Subject: ... --- nix/default.nix | 2 +- nix/notmuch-links.nix | 4 ++-- notmuch-links | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index af5f4b7..8abc9cf 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -8,7 +8,7 @@ rec { rolling-directory = self.callPackage ./rolling-directory.nix {}; recv = self.callPackage ./recv.nix {}; notmuch-tcp = self.callPackage ./notmuch-tcp.nix {}; - notmuch-links = self.callPackage ./notmuch-links.nix { inherit notmuch-tcp; }; + notmuch-links = self.callPackage ./notmuch-links.nix { inherit notmuch-ssh; }; notmuch-ssh = self.callPackage ./notmuch-ssh.nix {}; persistent-nix-shell = self.callPackage ./persistent-nix-shell.nix {}; worktime = self.callPackage ./worktime.nix {}; diff --git a/nix/notmuch-links.nix b/nix/notmuch-links.nix index 67ebe3b..0041c11 100644 --- a/nix/notmuch-links.nix +++ b/nix/notmuch-links.nix @@ -1,5 +1,5 @@ { stdenv -, notmuch-tcp +, notmuch-ssh , zsh, coreutils, gawk, gnused }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = [ "buildPhase" "installPhase" ]; inherit zsh coreutils gawk gnused; - notmuchtcp = notmuch-tcp; + notmuchssh = notmuch-ssh; buildPhase = '' substituteAll $src notmuch-links diff --git a/notmuch-links b/notmuch-links index 16cc01c..e46ddb2 100644 --- a/notmuch-links +++ b/notmuch-links @@ -3,7 +3,7 @@ set -xe function notmuch { - NOTMUCH_TCP=${NOTMUCH_TCP:-2011} @notmuchtcp@/bin/notmuch-tcp ${@} + NOTMUCH_INSTANCE=${NOTMUCH_INSTANCE:-rss} @notmuchssh@/bin/notmuch-ssh ${@} } function browser { -- cgit v1.2.3