diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-17 15:51:10 +0200 |
commit | 64de896a71a9ba3091259834077d54c0146bdab6 (patch) | |
tree | da58cc584fcc42a2b04f692aa3b1ada4c8949f5e /gnu/packages/astronomy.scm | |
parent | 5247aab8d6a18a4081ab7caeddb4fc083bca1f6b (diff) | |
parent | 6bfcb729268e0d20c6ae78224aef0eaad2ee2e74 (diff) | |
download | guix-64de896a71a9ba3091259834077d54c0146bdab6.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/astronomy.scm')
-rw-r--r-- | gnu/packages/astronomy.scm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 81c7481e0b..4cf7c10352 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -81,20 +81,25 @@ in FITS files.") (define-public wcslib (package (name "wcslib") - (version "5.20") + (version "6.2") (source (origin (method url-fetch) (uri (string-append - "ftp://ftp.atnf.csiro.au/pub/software/wcslib/" name "-" version + "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib" version ".tar.bz2")) (sha256 - (base32 "1c8g9kv4dxrnawnqi4spi2p10s2xs7x75pdfxhbqxgcc97dkgh0b")))) + (base32 "01fqckazhbfqqhyr0wd9vcks1m2afmsh83l981alxg2r54jgwkdv")))) (inputs `(("cfitsio" ,cfitsio))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags + (list (string-append "--with-cfitsiolib=" + (assoc-ref %build-inputs "cfitsio") "/lib") + (string-append "--with-cfitsioinc=" + (assoc-ref %build-inputs "cfitsio") "/include")) + #:phases (modify-phases %standard-phases (add-before 'configure 'patch-/bin/sh (lambda _ |