From f67cb8eb8c574f32384b641a0fd1bde73c23d207 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 23 Jan 2019 21:34:16 +0100 Subject: gnu: cdrtools: Remove custom build and install phases. * gnu/packages/cdrom.scm (cdrtools)[arguments]: Add make-flags; remove custom "build" and "install" phases. --- gnu/packages/cdrom.scm | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index cf095a17b7..b44cc3bce9 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Eric Bavier ;;; ;;; This file is part of GNU Guix. @@ -246,7 +246,12 @@ reconstruction capability.") (inputs `(("linux-headers" ,linux-libre-headers))) (arguments - `(#:phases + `(#:make-flags + (list "RM=rm" "LN=ln" "SYMLINK=ln -s" + "CONFIG_SHELL=sh" "CCOM=gcc" + (string-append "INS_BASE=" (assoc-ref %outputs "out")) + (string-append "INS_RBASE=" (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'build 'set-linux-headers @@ -261,19 +266,7 @@ reconstruction capability.") (find-files "DEFAULTS_ENG" "^Defaults\\.") (find-files "TEMPLATES" "^Defaults\\.")) (("/opt/schily") (assoc-ref %outputs "out"))) - #t)) - (replace 'build - (lambda _ - (zero? - (system* "make" "CONFIG_SHELL=sh" "CCOM=gcc" "RM=rm")))) - (replace 'install - (lambda _ - (zero? - (system* "make" - "RM=rm" "LN=ln" "SYMLINK=ln -s" - (string-append "INS_BASE=" (assoc-ref %outputs "out")) - (string-append "INS_RBASE=" (assoc-ref %outputs "out")) - "install" ))))) + #t))) #:tests? #f)) ; no tests (synopsis "Command line utilities to manipulate and burn CD/DVD/BD images") (description "cdrtools is a collection of command line utilities to create -- cgit v1.2.3