gnu: cdrtools: Use G-expressions.

* gnu/packages/cdrom.scm (cdrtools)[arguments]:
Rewrite as G-expressions.  Don't return #t from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2022-03-13 01:00:01 +01:00
parent b97a8b8941
commit 0ac0f43a90
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79

View File

@ -319,33 +319,32 @@ format, commonly used for VCDs or disks with subchannel data.")
(build-system gnu-build-system) (build-system gnu-build-system)
;; XXX cdrtools bundles a modified, relicensed early version of cdparanoia. ;; XXX cdrtools bundles a modified, relicensed early version of cdparanoia.
(arguments (arguments
`(#:make-flags (list #:make-flags
(list "RM=rm" "LN=ln" "SYMLINK=ln -s" #~(list "RM=rm" "LN=ln" "SYMLINK=ln -s"
"CONFIG_SHELL=sh" "CONFIG_SHELL=sh"
(string-append "CCOM=" ,(cc-for-target)) (string-append "CCOM=" #$(cc-for-target))
"LINKMODE=dynamic" "LINKMODE=dynamic"
(string-append "INS_BASE=" (assoc-ref %outputs "out")) (string-append "INS_BASE=" #$output)
(string-append "INS_RBASE=" (assoc-ref %outputs "out"))) (string-append "INS_RBASE=" #$output))
;; Parallel builds appear to be unsafe, see ;; Parallel builds appear to be unsafe, see
;; https://hydra.gnu.org/build/3346840/log/raw ;; https://hydra.gnu.org/build/3346840/log/raw
#:parallel-build? #f #:parallel-build? #f
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-before 'build 'set-linux-headers (add-before 'build 'set-linux-headers
(lambda _ (lambda _
(substitute* "autoconf/configure" (substitute* "autoconf/configure"
(("/usr/src/linux") (("/usr/src/linux")
(assoc-ref %build-inputs "kernel-headers"))) (assoc-ref %build-inputs "kernel-headers")))))
#t)) (add-before 'build 'avoid-bogus-RPATH-entry
(add-before 'build 'substitute-dirs (lambda _
(lambda _ (substitute* (append (find-files "DEFAULTS" "^Defaults\\.")
(substitute* (append (find-files "DEFAULTS" "^Defaults\\.") (find-files "DEFAULTS_ENG" "^Defaults\\.")
(find-files "DEFAULTS_ENG" "^Defaults\\.") (find-files "TEMPLATES" "^Defaults\\."))
(find-files "TEMPLATES" "^Defaults\\.")) (("/opt/schily")
(("/opt/schily") (assoc-ref %outputs "out"))) #$output)))))
#t))) #:tests? #f)) ; no tests
#:tests? #f)) ; no tests
(synopsis "Command line utilities to manipulate and burn CD/DVD/BD images") (synopsis "Command line utilities to manipulate and burn CD/DVD/BD images")
(description "cdrtools is a collection of command line utilities to create (description "cdrtools is a collection of command line utilities to create
CD's, DVD's or Blue Ray discs. The most important components are CD's, DVD's or Blue Ray discs. The most important components are