[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: util-linux: Use 'modify-phases'.
From: |
Ludovic Courtès |
Subject: |
01/02: gnu: util-linux: Use 'modify-phases'. |
Date: |
Tue, 14 Jul 2015 12:02:28 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 1b9cf4ad2fa4149e436787fcf50e4f68a098f32a
Author: Ludovic Courtès <address@hidden>
Date: Tue Jul 14 12:39:58 2015 +0200
gnu: util-linux: Use 'modify-phases'.
* gnu/packages/linux.scm (util-linux)[arguments]: Use 'modify-phases'
instead
of 'alist-cons-before'.
---
gnu/packages/linux.scm | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7810335..f27b828 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -417,17 +417,17 @@ providing the system administrator with some help in
common tasks.")
(string-append "--with-bashcompletiondir="
(assoc-ref %outputs "out")
"/etc/bash_completion.d"))
- #:phases (alist-cons-before
- 'check 'pre-check
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (net (assoc-ref inputs "net-base")))
- ;; Change the test to refer to the right file.
- (substitute* "tests/ts/misc/mcookie"
- (("/etc/services")
- (string-append net "/etc/services")))
- #t))
- %standard-phases)))
+ #:phases (modify-phases %standard-phases
+ (add-before
+ 'check 'pre-check
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (net (assoc-ref inputs "net-base")))
+ ;; Change the test to refer to the right file.
+ (substitute* "tests/ts/misc/mcookie"
+ (("/etc/services")
+ (string-append net "/etc/services")))
+ #t))))))
(inputs `(("zlib" ,zlib)
("ncurses" ,ncurses)))
(native-inputs