21/163: gnu: filtlong: Adjust wrap phase.

[guix-commits]

apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.

commit 4b3ead4fe91ce665d6c1d07bd541bae9f8ed7f2c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 16:23:50 2021 -0500

    gnu: filtlong: Adjust wrap phase.
    
    * gnu/packages/bioinformatics.scm (filtlong): Import the (guix build
    python-build-system) module and adjust the wrap-program phase to use the new
    Guix PYTHONPATH.  Delete trailing #t.
---
 gnu/packages/bioinformatics.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index e9e53f8..043f97f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -13817,7 +13817,12 @@ datasets.")
           (base32 "1xr92r820x8qlkcr3b57iw223yq8vjgyi42jr79w2xgw47qzr575"))))
       (build-system gnu-build-system)
       (arguments
-       `(#:tests? #f                    ; no check target
+       `(#:imported-modules ,(cons '(guix build python-build-system)
+                                 %gnu-build-system-modules)
+       #:modules ((guix build gnu-build-system)
+                  ((guix build python-build-system) #:select (guix-pythonpath))
+                  (guix build utils))
+       #:tests? #f                    ; no check target
          #:phases
          (modify-phases %standard-phases
            (delete 'configure)
@@ -13828,21 +13833,18 @@ datasets.")
                       (scripts (string-append out "/share/filtlong/scripts")))
                  (install-file "bin/filtlong" bin)
                  (install-file "scripts/histogram.py" scripts)
-                 (install-file "scripts/read_info_histograms.sh" scripts))
-               #t))
+                 (install-file "scripts/read_info_histograms.sh" scripts))))
            (add-after 'install 'wrap-program
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
-                      (path (getenv "PYTHONPATH")))
-                 (wrap-program (string-append out
-                                              
"/share/filtlong/scripts/histogram.py")
-                   `("PYTHONPATH" ":" prefix (,path))))
-               #t))
+                      (pythonpath (guix-pythonpath inputs)))
+                 (wrap-program (string-append
+                                out "/share/filtlong/scripts/histogram.py")
+                   `(,pythonpath ":" prefix (,(getenv pythonpath)))))))
            (add-before 'check 'patch-tests
              (lambda _
                (substitute* "scripts/read_info_histograms.sh"
-                 (("awk") (which "gawk")))
-               #t)))))
+                 (("awk") (which "gawk"))))))))
       (inputs
        `(("gawk" ,gawk)                 ;for read_info_histograms.sh
          ("python" ,python-2)           ;required for histogram.py