me
/
guix
Archived
1
0
Fork 0
Code

gnu: apostrophe: Don't reference the Python variable in arguments. 

* gnu/packages/gnome.scm (apostrophe)[arguments]: Use THIS-PACKAGE-INPUT
instead of accessing PYTHON directly.  Remove trailing #t.
[inputs]: Explicitly add PYTHON.
master
Marius Bakke 2021-12-26 12:19:27 +01:00
parent 6fdf851546
commit fabcdb446e
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/gnome.scm
View File

@ -11930,8 +11930,7 @@ GTK+. It integrates well with the GNOME desktop environment.")
(add-after 'unpack 'patch-meson (add-after 'unpack 'patch-meson
(lambda _ (lambda _
(substitute* "build-aux/meson_post_install.py" (substitute* "build-aux/meson_post_install.py"
(("gtk-update-icon-cache") "true")) (("gtk-update-icon-cache") "true"))))
#t))
(add-after 'glib-or-gtk-wrap 'python-and-gi-wrap (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out") (let ((prog (string-append (assoc-ref outputs "out")
@ -11939,7 +11938,8 @@ GTK+. It integrates well with the GNOME desktop environment.")
(pylib (string-append (assoc-ref outputs "out") (pylib (string-append (assoc-ref outputs "out")
"/lib/python" "/lib/python"
,(version-major+minor ,(version-major+minor
(package-version python)) (package-version
(this-package-input "python")))
"/site-packages"))) "/site-packages")))
(wrap-program prog (wrap-program prog
`("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) `("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
@ -11954,6 +11954,7 @@ GTK+. It integrates well with the GNOME desktop environment.")
gtk+ gtk+
libhandy libhandy
pandoc pandoc
python
python-chardet python-chardet
python-levenshtein python-levenshtein
python-regex python-regex