summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nix/default.nix2
-rw-r--r--nix/notmuch-links.nix4
-rw-r--r--notmuch-links2
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 {
8 rolling-directory = self.callPackage ./rolling-directory.nix {}; 8 rolling-directory = self.callPackage ./rolling-directory.nix {};
9 recv = self.callPackage ./recv.nix {}; 9 recv = self.callPackage ./recv.nix {};
10 notmuch-tcp = self.callPackage ./notmuch-tcp.nix {}; 10 notmuch-tcp = self.callPackage ./notmuch-tcp.nix {};
11 notmuch-links = self.callPackage ./notmuch-links.nix { inherit notmuch-tcp; }; 11 notmuch-links = self.callPackage ./notmuch-links.nix { inherit notmuch-ssh; };
12 notmuch-ssh = self.callPackage ./notmuch-ssh.nix {}; 12 notmuch-ssh = self.callPackage ./notmuch-ssh.nix {};
13 persistent-nix-shell = self.callPackage ./persistent-nix-shell.nix {}; 13 persistent-nix-shell = self.callPackage ./persistent-nix-shell.nix {};
14 worktime = self.callPackage ./worktime.nix {}; 14 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 @@
1{ stdenv 1{ stdenv
2, notmuch-tcp 2, notmuch-ssh
3, zsh, coreutils, gawk, gnused 3, zsh, coreutils, gawk, gnused
4}: 4}:
5 5
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
11 phases = [ "buildPhase" "installPhase" ]; 11 phases = [ "buildPhase" "installPhase" ];
12 12
13 inherit zsh coreutils gawk gnused; 13 inherit zsh coreutils gawk gnused;
14 notmuchtcp = notmuch-tcp; 14 notmuchssh = notmuch-ssh;
15 15
16 buildPhase = '' 16 buildPhase = ''
17 substituteAll $src notmuch-links 17 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 @@
3set -xe 3set -xe
4 4
5function notmuch { 5function notmuch {
6 NOTMUCH_TCP=${NOTMUCH_TCP:-2011} @notmuchtcp@/bin/notmuch-tcp ${@} 6 NOTMUCH_INSTANCE=${NOTMUCH_INSTANCE:-rss} @notmuchssh@/bin/notmuch-ssh ${@}
7} 7}
8 8
9function browser { 9function browser {