diff options
| author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2023-05-24 22:51:44 +0100 |
|---|---|---|
| committer | Vinicius Monego <monego@posteo.net> | 2023-05-25 21:20:05 -0300 |
| commit | 2e501ccc03a70ce546c1885951f131d711c93b59 (patch) | |
| tree | 9461f189aaa1f7052e0233fea4acdd32d9f7c269 | |
| parent | ee9dfc1dda5e8bd8b92f49b0c1e1e503cc29c0ad (diff) | |
gnu: python-fitsio: Use G-Expressions.
* gnu/packages/astronomy.scm (python-fitsio): Use G-Expressions.
Signed-off-by: Vinicius Monego <monego@posteo.net>
| -rw-r--r-- | gnu/packages/astronomy.scm | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index a3a037a853..2c99d1051c 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -476,27 +476,28 @@ in FITS files.") (modules '((guix build utils))) (snippet ;; Remove the bundled cfitsio - `(begin - (delete-file-recursively "cfitsio3490") - (substitute* "MANIFEST.in" - (("recursive-include cfitsio3490.*$\n") "")))))) + #~(begin + (delete-file-recursively "cfitsio3490") + (substitute* "MANIFEST.in" + (("recursive-include cfitsio3490.*$\n") "")))))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'unbundle-cfitsio - (lambda* (#:key inputs #:allow-other-keys) - (let* ((cfitsio (assoc-ref inputs "cfitsio")) - (includedir (string-append "\"" cfitsio "/include\"")) - (libdir (string-append "\"" cfitsio "/lib\""))) - ;; Use Guix' cfitsio instead of the bundled one - (substitute* "setup.py" - (("self.use_system_fitsio = False") "pass") - (("self.system_fitsio_includedir = None") "pass") - (("self.system_fitsio_libdir = None") "pass") - (("self.use_system_fitsio") "True") - (("self.system_fitsio_includedir") includedir) - (("self.system_fitsio_libdir") libdir)))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unbundle-cfitsio + (lambda _ + (let* ((cfitsio #$(this-package-input "cfitsio")) + (includedir (string-append "\"" cfitsio "/include\"")) + (libdir (string-append "\"" cfitsio "/lib\""))) + ;; Use Guix' cfitsio instead of the bundled one + (substitute* "setup.py" + (("self.use_system_fitsio = False") "pass") + (("self.system_fitsio_includedir = None") "pass") + (("self.system_fitsio_libdir = None") "pass") + (("self.use_system_fitsio") "True") + (("self.system_fitsio_includedir") includedir) + (("self.system_fitsio_libdir") libdir)))))))) (inputs (list curl)) (propagated-inputs (list python-numpy cfitsio)) |