From c842d425933d0b7d6c5e88bb5fd52c3008b8951d Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 6 Apr 2017 22:27:23 +1000 Subject: [PATCH] gnu: samtools: Use "modify-phases" syntax. * gnu/packages/bioinformatics.scm (samtools)[arguments]: Use "modify-phases" syntax. --- gnu/packages/bioinformatics.scm | 41 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 16339f9d6e..7669b4c3f0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4533,29 +4533,26 @@ (define-public samtools #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:configure-flags (list "--with-ncurses") #:phases - (alist-cons-after - 'unpack 'patch-tests - (lambda _ - (substitute* "test/test.pl" - ;; The test script calls out to /bin/bash - (("/bin/bash") (which "bash"))) - #t) - (alist-cons-after - 'install 'install-library - (lambda* (#:key outputs #:allow-other-keys) - (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) - (install-file "libbam.a" lib) + (modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + (substitute* "test/test.pl" + ;; The test script calls out to /bin/bash + (("/bin/bash") (which "bash"))) #t)) - (alist-cons-after - 'install 'install-headers - (lambda* (#:key outputs #:allow-other-keys) - (let ((include (string-append (assoc-ref outputs "out") - "/include/samtools/"))) - (for-each (lambda (file) - (install-file file include)) - (scandir "." (lambda (name) (string-match "\\.h$" name)))) - #t)) - %standard-phases))))) + (add-after 'install 'install-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) + (install-file "libbam.a" lib) + #t))) + (add-after 'install 'install-headers + (lambda* (#:key outputs #:allow-other-keys) + (let ((include (string-append (assoc-ref outputs "out") + "/include/samtools/"))) + (for-each (lambda (file) + (install-file file include)) + (scandir "." (lambda (name) (string-match "\\.h$" name)))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("ncurses" ,ncurses) ("perl" ,perl)