From c84dce05c5135b466548973025befef175b9b0fd Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Thu, 27 Jul 2023 00:15:28 +0100
Subject: [PATCH] gnu: sextractor: Use G-expressions.
* gnu/packages/astronomy.scm (sextractor): Use G-expressions.
[inputs]: Remove labels.
Signed-off-by: Andreas Enge <andreas@enge.fr>
---
gnu/packages/astronomy.scm | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 4637265b95..b957e17350 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -933,27 +933,26 @@ from Stark Labs.")
;; build to use `openblas' instead. It requires FFTW with single precision
;; `fftwf'.
(arguments
- `(#:configure-flags
- (list
- "--enable-openblas"
- (string-append
- "--with-cfitsio-libdir=" (assoc-ref %build-inputs "cfitsio") "/lib")
- (string-append
- "--with-cfitsio-incdir=" (assoc-ref %build-inputs "cfitsio") "/include")
- (string-append
- "--with-openblas-libdir=" (assoc-ref %build-inputs "openblas") "/lib")
- (string-append
- "--with-openblas-incdir=" (assoc-ref %build-inputs "openblas") "/include")
- (string-append
- "--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib")
- (string-append
- "--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include"))))
+ (list
+ #:configure-flags
+ #~(list
+ "--enable-openblas"
+ (string-append "--with-cfitsio-incdir="
+ #$(this-package-input "cfitsio") "/include")
+ (string-append "--with-cfitsio-libdir="
+ #$(this-package-input "cfitsio") "/lib")
+ (string-append "--with-fftw-incdir="
+ #$(this-package-input "fftwf") "/include")
+ (string-append "--with-fftw-libdir="
+ #$(this-package-input "fftwf") "/lib")
+ (string-append "--with-openblas-incdir="
+ #$(this-package-input "openblas") "/include")
+ (string-append "--with-openblas-libdir="
+ #$(this-package-input "openblas") "/lib"))))
(native-inputs
(list autoconf automake libtool))
(inputs
- `(("cfitsio" ,cfitsio)
- ("openblas" ,openblas)
- ("fftw" ,fftwf)))
+ (list cfitsio fftwf openblas))
(home-page "https://www.astromatic.net/software/sextractor")
(synopsis "Extract catalogs of sources from astronomical images")
(description