apteryx pushed a commit to branch cu/farewell-to-pythonpath in repository guix.
commit 485f62c3e88d3b78875de27974982a1f72967f96 Author: Maxim Cournoyer <[email protected]> AuthorDate: Fri Jan 22 22:55:01 2021 -0500 gnu: manuskript: Wrap with the new Guix PYTHONPATH. * gnu/packages/text-editors.scm (manuskript) [phases]: Delete trailing #t. {install}: Wrap with the new Guix PYTHONPATH. --- gnu/packages/text-editors.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 81915ca..379ae56 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -628,7 +628,7 @@ environment with Markdown markup.") (delete 'configure) (delete 'build) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (share (string-append out "/share/manuskript"))) ;; Install data. @@ -648,9 +648,10 @@ environment with Markdown markup.") ;; Wrap executable in "$out/share/manuskript/bin" and ;; link to it from "$out/bin". (let ((bin (string-append out "/bin")) - (executable (string-append share "/bin/manuskript"))) + (executable (string-append share "/bin/manuskript")) + (pythonpath (guix-pythonpath inputs))) (wrap-program executable - (list "PYTHONPATH" 'prefix (list (getenv "PYTHONPATH")))) + (list pythonpath 'prefix (list (getenv pythonpath)))) (mkdir-p bin) (with-directory-excursion bin (symlink (string-append share "/bin/manuskript") @@ -670,8 +671,7 @@ environment with Markdown markup.") #:terminal #f #:type "Application" #:icon "manuskript" - #:categories "Office;WordProcessor;")) - #t)))))) + #:categories "Office;WordProcessor;")))))))) (inputs `(("pandoc" ,pandoc) ("python-lxml" ,python-lxml)
