nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: valgrind: Use 'modify-phases' syntax. 

* gnu/packages/valgrind.scm (valgrind)[arguments]: Use 'modify-phases'
syntax.
This commit is contained in:
Efraim Flashner 2016-10-27 10:16:39 +03:00
parent e68168eb87
commit 5fd84e288c
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/valgrind.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -41,18 +42,18 @@
(patches (search-patches "valgrind-enable-arm.patch")))) (patches (search-patches "valgrind-enable-arm.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-after '(#:phases
'install 'patch-suppression-files (modify-phases %standard-phases
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'patch-suppression-files
;; Don't assume the FHS. (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) ;; Don't assume the FHS.
(dir (string-append out "/lib/valgrind"))) (let* ((out (assoc-ref outputs "out"))
(substitute* (find-files dir "\\.supp$") (dir (string-append out "/lib/valgrind")))
(("obj:/lib") "obj:*/lib") (substitute* (find-files dir "\\.supp$")
(("obj:/usr/X11R6/lib") "obj:*/lib") (("obj:/lib") "obj:*/lib")
(("obj:/usr/lib") "obj:*/lib")) (("obj:/usr/X11R6/lib") "obj:*/lib")
#t)) (("obj:/usr/lib") "obj:*/lib"))
%standard-phases))) #t))))))
(inputs `(;; GDB is needed to provide a sane default for `--db-command'. (inputs `(;; GDB is needed to provide a sane default for `--db-command'.
("gdb" ,gdb))) ("gdb" ,gdb)))
(native-inputs `(("perl" ,perl))) (native-inputs `(("perl" ,perl)))