guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: gnu: cdrtools: Remove custom build and install phases.


From: guix-commits
Subject: 01/03: gnu: cdrtools: Remove custom build and install phases.
Date: Wed, 23 Jan 2019 15:46:14 -0500 (EST)

rekado pushed a commit to branch master
in repository guix.

commit f67cb8eb8c574f32384b641a0fd1bde73c23d207
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Jan 23 21:34:16 2019 +0100

    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 cf095a1..b44cc3b 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2017 Nils Gillmann <address@hidden>
 ;;; Copyright © 2018 Oleg Pykhalov <address@hidden>
-;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2018, 2019 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2019 Eric Bavier <address@hidden>
 ;;;
 ;;; 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]