guix-commits
[Top][All Lists]
Advanced

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

02/02: gnu: abbaye: Use 'modify-phases'.


From: Alex Kost
Subject: 02/02: gnu: abbaye: Use 'modify-phases'.
Date: Tue, 13 Oct 2015 10:33:26 +0000

alezost pushed a commit to branch master
in repository guix.

commit aec05972cef03010a1ad7d1ec83780e215eb1215
Author: Alex Kost <address@hidden>
Date:   Sat Oct 10 10:45:04 2015 +0300

    gnu: abbaye: Use 'modify-phases'.
    
    * gnu/packages/games.scm (abbaye)[arguments]: Use 'modify-phases'.
---
 gnu/packages/games.scm |   59 +++++++++++++++++++++++------------------------
 1 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index cbc147f..e250bf9 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -161,36 +161,35 @@ scriptable with Guile.")
      '(#:modules ((ice-9 match)
                   (guix build gnu-build-system)
                   (guix build utils))
-       #:phases (alist-cons-after
-                 'set-paths 'set-sdl-paths
-                 (lambda* (#:key inputs outputs (search-paths '()) 
#:allow-other-keys)
-                   (define input-directories
-                     (match inputs
-                       (((_ . dir) ...)
-                        dir)))
-                   ;; This package does not use pkg-config, so modify CPATH
-                   ;; variable to point to include/SDL for SDL header files.
-                   (set-path-environment-variable "CPATH"
-                                                  '("include/SDL")
-                                                  input-directories))
-                 (alist-cons-after
-                  'patch-source-shebangs 'patch-makefile
-                  (lambda* (#:key outputs #:allow-other-keys)
-                    ;; Replace /usr with package output directory.
-                    (for-each (lambda (file)
-                                (substitute* file
-                                  (("/usr") (assoc-ref outputs "out"))))
-                              '("makefile" "src/pantallas.c" "src/comun.h")))
-                  (alist-cons-before
-                   'install 'make-install-dirs
-                   (lambda* (#:key outputs #:allow-other-keys)
-                     (let ((prefix (assoc-ref outputs "out")))
-                       ;; Create directories that the makefile assumes exist.
-                       (mkdir-p (string-append prefix "/bin"))
-                       (mkdir-p (string-append prefix "/share/applications"))
-                       (mkdir-p (string-append prefix "/share/pixmaps"))))
-                   ;; No configure script.
-                   (alist-delete 'configure %standard-phases))))
+       #:phases (modify-phases %standard-phases
+                  (add-after 'set-paths 'set-sdl-paths
+                    (lambda* (#:key inputs outputs (search-paths '())
+                              #:allow-other-keys)
+                      (define input-directories
+                        (match inputs
+                          (((_ . dir) ...)
+                           dir)))
+                      ;; This package does not use pkg-config, so modify CPATH
+                      ;; variable to point to include/SDL for SDL header files.
+                      (set-path-environment-variable "CPATH"
+                                                     '("include/SDL")
+                                                     input-directories)))
+                  (add-after 'patch-source-shebangs 'patch-makefile
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      ;; Replace /usr with package output directory.
+                      (for-each (lambda (file)
+                                  (substitute* file
+                                    (("/usr") (assoc-ref outputs "out"))))
+                                '("makefile" "src/pantallas.c" 
"src/comun.h"))))
+                  (add-before 'install 'make-install-dirs
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((prefix (assoc-ref outputs "out")))
+                        ;; Create directories that the makefile assumes exist.
+                        (mkdir-p (string-append prefix "/bin"))
+                        (mkdir-p (string-append prefix "/share/applications"))
+                        (mkdir-p (string-append prefix "/share/pixmaps")))))
+                  ;; No configure script.
+                  (delete 'configure))
        #:tests? #f)) ;; No check target.
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("sdl" ,sdl)



reply via email to

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