summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Le Vaillant <glv@posteo.net>2020-04-30 10:09:15 +0200
committerGuillaume Le Vaillant <glv@posteo.net>2020-04-30 10:09:15 +0200
commitf03e5ca59f2f099693def2c8e6ff409e5b4ed40a (patch)
treec72c60d7b80730d6850adcf17ed4d64fea4d7090
parent89ea0415b33bc3382ead3755fc2fc27c11920878 (diff)
downloadpatches-f03e5ca59f2f099693def2c8e6ff409e5b4ed40a.tar
patches-f03e5ca59f2f099693def2c8e6ff409e5b4ed40a.tar.gz
gnu: gnuradio: Fix runtime python environment for plugins.
* gnu/packages/radio.scm (gnuradio)[native-search-paths]: Add PYTHONPATH. [native-inputs]: Move python ... [inputs]: ... here.
-rw-r--r--gnu/packages/radio.scm12
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 935880780f..30567431bf 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -26,6 +26,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix utils)
#:use-module (gnu packages algebra)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
@@ -266,7 +267,6 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
("ghostscript" ,ghostscript)
("orc" ,orc)
("pkg-config" ,pkg-config)
- ("python" ,python)
("python-cheetah" ,python-cheetah)
("python-mako" ,python-mako)
("python-pyzmq" ,python-pyzmq)
@@ -293,6 +293,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
("log4cpp" ,log4cpp)
("pango" ,pango)
("portaudio" ,portaudio)
+ ("python" ,python)
("python-click" ,python-click)
("python-click-plugins" ,python-click-plugins)
("python-lxml" ,python-lxml)
@@ -364,9 +365,16 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
`("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths))))
#t)))))
(native-search-paths
+ ;; Variables required to find third-party plugins at runtime.
(list (search-path-specification
(variable "GRC_BLOCKS_PATH")
- (files '("/share/gnuradio/grc/blocks")))))
+ (files '("share/gnuradio/grc/blocks")))
+ (search-path-specification
+ (variable "PYTHONPATH")
+ (files (list (string-append "lib/python"
+ (version-major+minor
+ (package-version python))
+ "/site-packages"))))))
(synopsis "Toolkit for software-defined radios")
(description
"GNU Radio is a development toolkit that provides signal processing blocks