cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #70903 from minijackson/fix-alot-completion

Browse source 
alot: fix hardcoded Python in Zsh completion
This commit is contained in:
Matthew Bauer 2019-11-07 17:05:10 -05:00 committed by GitHub
commit 561edb92e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/python-modules/alot/default.nix
View file

@ -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