From 8dc4c3953d3e04959fa3d35659e1591e5b52f88e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 10 Oct 2019 13:10:53 +0200 Subject: [PATCH] alot: fix hardcoded Python in Zsh completion This allows completing `alot compose --sender ` --- pkgs/development/python-modules/alot/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 9dd3a449664..fa21b66e3ab 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, isPy3k , notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme , service-identity , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null @@ -39,7 +39,9 @@ buildPythonPackage rec { checkInputs = [ awk future mock gnupg procps ]; - postInstall = lib.optionalString withManpage '' + postInstall = let + completionPython = python.withPackages (ps: [ ps.configobj ]); + in lib.optionalString withManpage '' mkdir -p $out/man cp -r docs/build/man $out/man '' @@ -47,6 +49,8 @@ buildPythonPackage rec { mkdir -p $out/share/{applications,alot} cp -r extra/themes $out/share/alot + substituteInPlace extra/completion/alot-completion.zsh \ + --replace "python3" "${completionPython.interpreter}" install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop