amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gnuradio: Simplify package definition.

Browse source 
* gnu/packages/radio.scm (gnuradio)[native-inputs]: Remove labels.
  [propagated-inputs]: Move spdlog to...
  [inputs]: ... here. Remove labels.
  [arguments]: Remove trailing #t in phases.
This commit is contained in:
Guillaume Le Vaillant 2022-06-30 10:53:29 +02:00
parent 1256f36634
commit 1f6a9bbea6
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 53 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

110
gnu/packages/radio.scm
View file

@ -556,58 +556,57 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
(base32 "0xdhb2blzajxpi0f2ch23hh6bzdwz5q7syi3bmiqzdjlj2yjfzd4")))) (base32 "0xdhb2blzajxpi0f2ch23hh6bzdwz5q7syi3bmiqzdjlj2yjfzd4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) (list doxygen
("ghostscript" ,ghostscript) ghostscript
("js-mathjax" ,js-mathjax) js-mathjax
("orc" ,orc) orc
("pkg-config" ,pkg-config) pkg-config
("pybind11" ,pybind11) pybind11
("python-cheetah" ,python-cheetah) python-cheetah
("python-mako" ,python-mako) python-mako
("python-pyzmq" ,python-pyzmq) python-pyzmq
("python-scipy" ,python-scipy) python-scipy
("python-sphinx" ,python-sphinx) python-sphinx
("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts (texlive-updmap.cfg (list texlive-amsfonts
texlive-amsmath texlive-amsmath
;; TODO: Add newunicodechar. ;; TODO: Add newunicodechar.
texlive-latex-graphics))) texlive-latex-graphics))
("xorg-server" ,xorg-server-for-tests))) xorg-server-for-tests))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) (list alsa-lib
("boost" ,boost) boost
("cairo" ,cairo) cairo
("codec2" ,codec2) codec2
("cppzmq" ,cppzmq) cppzmq
("fftwf" ,fftwf) fftwf
("gmp" ,gmp) gmp
("gsl" ,gsl) gsl
("gsm" ,gsm) gsm
("gtk+" ,gtk+) gtk+
("jack" ,jack-1) jack-1
("libsndfile" ,libsndfile) libsndfile
("log4cpp" ,log4cpp) log4cpp
("pango" ,pango) pango
("portaudio" ,portaudio) portaudio
("python" ,python) python
("python-click" ,python-click) python-click
("python-click-plugins" ,python-click-plugins) python-click-plugins
("python-jsonschema" ,python-jsonschema) python-jsonschema
("python-lxml" ,python-lxml) python-lxml
("python-matplotlib" ,python-matplotlib) python-matplotlib
("python-numpy" ,python-numpy) python-numpy
("python-pycairo" ,python-pycairo) python-pycairo
("python-pygobject" ,python-pygobject) python-pygobject
("python-pyqt" ,python-pyqt-without-qtwebkit) python-pyqt-without-qtwebkit
("python-pyqtgraph" ,python-pyqtgraph) python-pyqtgraph
("python-pyyaml" ,python-pyyaml) python-pyyaml
("qtbase" ,qtbase-5) qtbase-5
("qwt" ,qwt) qwt
("sdl" ,sdl) sdl
("soapysdr" ,soapysdr) soapysdr
("volk" ,volk) spdlog
("zeromq" ,zeromq))) volk
(propagated-inputs zeromq))
(list spdlog))
(arguments (arguments
`(#:modules ((guix build cmake-build-system) `(#:modules ((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
@ -645,14 +644,12 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
(substitute* '("gr-vocoder/include/gnuradio/vocoder/codec2.h" (substitute* '("gr-vocoder/include/gnuradio/vocoder/codec2.h"
"gr-vocoder/include/gnuradio/vocoder/freedv_api.h") "gr-vocoder/include/gnuradio/vocoder/freedv_api.h")
(("<codec2/") (("<codec2/")
"<")) "<"))))
#t))
(add-before 'check 'set-test-environment (add-before 'check 'set-test-environment
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")))
#t))
(replace 'check (replace 'check
(lambda* (#:key tests? parallel-tests? #:allow-other-keys) (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(invoke "ctest" "-j" (if parallel-tests? (invoke "ctest" "-j" (if parallel-tests?
@ -686,8 +683,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
#f)))) #f))))
inputs))) inputs)))
(wrap-program (string-append out "/bin/gnuradio-companion") (wrap-program (string-append out "/bin/gnuradio-companion")
`("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths)))) `("GI_TYPELIB_PATH" ":" prefix ,(filter identity paths)))))))))
#t)))))
(native-search-paths (native-search-paths
;; Variables required to find third-party plugins at runtime. ;; Variables required to find third-party plugins at runtime.
(list (search-path-specification (list (search-path-specification