diff options
Diffstat (limited to 'gnu/packages/cdrom.scm')
| -rw-r--r-- | gnu/packages/cdrom.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 717d59f0e9..1ad4829dc4 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 John Darrington <jmd@gnu.org> @@ -235,6 +235,7 @@ files.") (build-system gnu-build-system) (arguments `(#:tests? #f ; there is no check target + #:parallel-build? #f ;randomly fails to link #:configure-flags ; Add $libdir to the RUNPATH of all the executables. (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) ;; Building in parallel is flaky: “ld: […]/cachetest.c:393: undefined @@ -927,7 +928,15 @@ Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.") version ".tar.gz")) (sha256 (base32 - "0g2zyzb56czh429qy87lvaddzjnlcq8c616ddxsmsshz3clhyzrh")))) + "0g2zyzb56czh429qy87lvaddzjnlcq8c616ddxsmsshz3clhyzrh")) + (patches (search-patches "cdrkit-libre-cross-compile.patch")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Fix building with gcc-10. + (substitute* "genisoimage/genisoimage.h" + (("char\t\t\\*outfile") + "extern char\t*outfile")))))) (build-system cmake-build-system) (inputs `(("bzip2" ,bzip2) @@ -1045,7 +1054,7 @@ drive and disc (including CD-ROMs and DVD-ROMs).") (let ((prog (string-append (assoc-ref outputs "out") "/bin/cdemu"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH")))) + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))) #t)))))) (home-page "https://cdemu.sourceforge.io/") (synopsis "Command-line client for controlling cdemu-daemon") |