me
/
guix
Archived
1
0
Fork 0
Code

gnu: Replace PYTHONPATH with GUIX_PYTHONPATH. 

In packages that do not use python-build-system, PYTHONPATH is generally
not defined. Instead we can use GUIX_PYTHONPATH which should contain all
Python dependencies.

* gnu/packages/bioinformatics.scm (shorah)[arguments]: Replace
  PYTHONPATH with GUIX_PYTHONPATH.
* gnu/packages/debug.scm (c-vise)[arguments]: Idem.
* gnu/packages/gnome.scm (drawing, apostrophe, ocrfeeder)[arguments]: Idem.
* gnu/packages/music.scm (a2jmidid)[arguments]: Idem.
* gnu/packages/syndication.scm (gfeeds)[arguments]: Idem.
* gnu/packages/xdisorg.scm (gammastep)[arguments]: Idem.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
master
Felix Gruber 2021-09-06 06:07:22 +00:00 committed by Guillaume Le Vaillant
parent 722c17992e
commit 93bf42361c
No known key found for this signature in database
GPG Key ID: 6BE8208ADF21FE3F
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/bioinformatics.scm
View File

@ -21,6 +21,7 @@
;;; Copyright © 2020 Bonface Munyoki Kilyungi <bonfacemunyoki@gmail.com>
;;; Copyright © 2021 Tim Howes <timhowes@lavabit.com>
;;; Copyright © 2021 Hong Li <hli@mdc-berlin.de>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -7788,7 +7789,7 @@ data. It also generates basic statistics for your sequences.")
,(version-major+minor
(package-version python))
"/site-packages"))
(pythonpath (getenv "PYTHONPATH"))
(pythonpath (getenv "GUIX_PYTHONPATH"))
(script (string-append out "/bin/shorah")))
(chmod script #o555)
(wrap-program script `("PYTHONPATH" ":" prefix (,site ,pythonpath))))))

3
gnu/packages/debug.scm
View File

@ -7,6 +7,7 @@
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -213,7 +214,7 @@ tools that process C/C++ code.")
(add-after 'install 'wrap
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(python-path (getenv "PYTHONPATH")))
(python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/cvise")
`("PYTHONPATH" ":" prefix (,python-path)))
#t))))))

7
gnu/packages/gnome.scm
View File

@ -61,6 +61,7 @@
;;; Copyright © 2021 Trevor Hass <thass@okstate.edu>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -4205,7 +4206,7 @@ engineering.")
(package-version python))
"/site-packages")))
(wrap-program prog
`("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
`("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t))))))
(native-inputs
@ -11582,7 +11583,7 @@ GTK+. It integrates well with the GNOME desktop environment.")
(package-version python))
"/site-packages")))
(wrap-program prog
`("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
`("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
`("PATH" prefix (,(dirname
(search-input-file inputs
@ -12218,7 +12219,7 @@ world.")
(package-version python))
"/site-packages")))
(wrap-program prog
`("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
`("PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t))))))
(native-inputs

2
gnu/packages/music.scm
View File

@ -6886,7 +6886,7 @@ It is provided as an LV2 plugin and as a standalone Jack application.")
(substitute* (string-append bin "a2j")
(("a2j_control") (string-append bin "a2j_control")))
(wrap-program (string-append bin "a2j_control")
`("PYTHONPATH" prefix (,(getenv "PYTHONPATH"))))
`("PYTHONPATH" prefix (,(getenv "GUIX_PYTHONPATH"))))
#t))))))
(build-system meson-build-system)
(inputs

3
gnu/packages/syndication.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -605,7 +606,7 @@ that aims to be quite fast and comfortable to its user.")
(lambda* (#:key outputs #:allow-other-keys)
(wrap-program (string-append
(assoc-ref outputs "out") "/bin/gfeeds")
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
`("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
`("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS"))))
#t)))))

3
gnu/packages/xdisorg.scm
View File

@ -51,6 +51,7 @@
;;; Copyright © 2021 Niklas Eklund <niklas.eklund@posteo.net>
;;; Copyright © 2021 Nikita Domnitskii <nikita@domnitskii.me>
;;; Copyright © 2021 ikasero <ahmed@ikasero.com>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1557,7 +1558,7 @@ protocol.")
;; to Python libraries.
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/gammastep-indicator")
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
`("PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")))))))))
(native-inputs