diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/presentation.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/presentation.scm')
| -rw-r--r-- | gnu/packages/presentation.scm | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gnu/packages/presentation.scm b/gnu/packages/presentation.scm index 0ad407d36c..1601ba7f2a 100644 --- a/gnu/packages/presentation.scm +++ b/gnu/packages/presentation.scm @@ -62,25 +62,24 @@ `("PATH" ":" prefix (,(dirname (which "cowsay")) ,(dirname (which "figlet")) ,(dirname (which "jp2a")))) - `("PYTHONPATH" prefix + `("GUIX_PYTHONPATH" prefix ,(cons (string-append out "/lib/python" (python-version python) "/site-packages") (search-path-as-string->list - (or (getenv "PYTHONPATH") "")))))) + (or (getenv "GUIX_PYTHONPATH") "")))))) '("presentty" "presentty-console"))) #t))))) (inputs - `(("cowsay" ,cowsay) - ("figlet" ,figlet) - ("jp2a" ,jp2a) - ("python-docutils" ,python-docutils) - ("python-pillow" ,python-pillow-2.9) - ("python-six" ,python-six) - ("python-urwid" ,python-urwid))) + (list cowsay + figlet + jp2a + python-docutils + python-pillow-2.9 + python-six + python-urwid)) (native-inputs - `(("python-pbr" ,python-pbr) - ("python-pygments" ,python-pygments))) + (list python-pbr python-pygments)) (home-page "http://git.inaugust.com/cgit/presentty/") (synopsis "Console-based presentation system") (description "Presentty is a console-based presentation program where slides |