From f55aa62c7dd25d44b37985ef5f109eb8212f5ae7 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 24 Nov 2019 20:14:07 +0100 Subject: fix paths --- nix/notmuch-tcp.nix | 4 ++-- notmuch-tcp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/notmuch-tcp.nix b/nix/notmuch-tcp.nix index 438a086..59d2e39 100644 --- a/nix/notmuch-tcp.nix +++ b/nix/notmuch-tcp.nix @@ -1,5 +1,5 @@ { stdenv -, zsh, socat, nettools +, zsh, socat, nettools, coreutils }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { phases = [ "buildPhase" "installPhase" ]; - inherit zsh socat nettools; + inherit zsh socat nettools coreutils; buildPhase = '' substituteAll $src notmuch-tcp diff --git a/notmuch-tcp b/notmuch-tcp index 71680d0..57da3f5 100755 --- a/notmuch-tcp +++ b/notmuch-tcp @@ -1,9 +1,9 @@ #!@zsh@/bin/zsh NOTMUCH_TCP=${NOTMUCH_TCP:-2010} -HOST=${HOST:-$(@nettools/bin/hostname -s)} +HOST=${HOST:-$(@nettools@/bin/hostname -s)} NOTMUCH_HOST=${NOTMUCH_HOST:-odin.asgard.yggdrasil} cd ~/.notmuch-tcp -@socat@/bin/socat STDIO,ignoreeof openssl:${NOTMUCH_HOST}:${NOTMUCH_TCP},verify=1,cafile=ca.pem,certificate=${HOST}.pem,key=${HOST}.key <<(print "${(@q)@}"; inp=$(cat); printf "%d\n" $(wc -c <<<"${inp}"); cat <<<"${inp}") +@socat@/bin/socat STDIO,ignoreeof openssl:${NOTMUCH_HOST}:${NOTMUCH_TCP},verify=1,cafile=ca.pem,certificate=${HOST}.pem,key=${HOST}.key <<(print "${(@q)@}"; inp=$(cat); printf "%d\n" $(@coreutils@/bin/wc -c <<<"${inp}"); @coreutils@/bin/cat <<<"${inp}") -- cgit v1.2.3