summary refs log tree commit diff
diff options
context:
space:
mode:
authorSharlatan Hellseher <sharlatanus@gmail.com>2023-07-27 00:15:28 +0100
committerAndreas Enge <andreas@enge.fr>2023-08-07 20:17:17 +0200
commitc84dce05c5135b466548973025befef175b9b0fd (patch)
tree06c14e7f72f0b17841eb05341f3e3372cd33944e
parent2d91ef7a93b9eefc808df63d02f707a3a87254d6 (diff)
downloadguix-c84dce05c5135b466548973025befef175b9b0fd.tar.gz
gnu: sextractor: Use G-expressions.
* gnu/packages/astronomy.scm (sextractor): Use G-expressions.
[inputs]: Remove labels.

Signed-off-by: Andreas Enge <andreas@enge.fr>
-rw-r--r--gnu/packages/astronomy.scm35
1 files 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