[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: gnu: gnuradio: Use shared volk instead of bundled one.
From: |
guix-commits |
Subject: |
01/04: gnu: gnuradio: Use shared volk instead of bundled one. |
Date: |
Wed, 15 Apr 2020 04:22:18 -0400 (EDT) |
glv pushed a commit to branch master
in repository guix.
commit 8e1e86b0e27fcb620c1a9b9746383567b3018575
Author: Guillaume Le Vaillant <address@hidden>
AuthorDate: Wed Apr 15 10:02:13 2020 +0200
gnu: gnuradio: Use shared volk instead of bundled one.
* gnu/packages/radio.scm (gnuradio)[source]: Add snippet to delete bundled
volk.
[inputs]: Add volk.
[arguments]: Add "-DENABLE_INTERNAL_VOLK=OFF" to configure-flags.
---
gnu/packages/radio.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index e1e5a98..f047f5b 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -34,6 +34,7 @@
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages engineering)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages gstreamer)
@@ -243,7 +244,13 @@ used by RDS Spy, and audio files containing
@dfn{multiplex} signals (MPX).")
(uri (string-append "https://www.gnuradio.org/releases/gnuradio/"
"gnuradio-" version ".tar.xz"))
(sha256
- (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r"))))
+ (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Delete bundled volk to use the shared one.
+ (delete-file-recursively "volk")
+ #t))))
(build-system cmake-build-system)
(native-inputs
`(("doxygen" ,doxygen)
@@ -288,6 +295,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex}
signals (MPX).")
("python-pyyaml" ,python-pyyaml)
("qtbase" ,qtbase)
("qwt" ,qwt)
+ ("volk" ,volk)
("zeromq" ,zeromq)))
(arguments
`(#:modules ((guix build cmake-build-system)
@@ -298,6 +306,8 @@ used by RDS Spy, and audio files containing @dfn{multiplex}
signals (MPX).")
#:imported-modules (,@%cmake-build-system-modules
(guix build glib-or-gtk-build-system)
(guix build python-build-system))
+ #:configure-flags
+ '("-DENABLE_INTERNAL_VOLK=OFF")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths