diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-05-24 10:12:50 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-05-24 10:12:50 +0300 |
| commit | 24f18482d3d57a49f0711e0c42f1e0ef5c1549df (patch) | |
| tree | 8ad9dc5b6dc52e5bd98f58954709d7b04df94aef /gnu/packages/geo.scm | |
| parent | 007b156a3e25bdfed4869c4301c18c9d8a82ae05 (diff) | |
| download | guix-24f18482d3d57a49f0711e0c42f1e0ef5c1549df.tar.gz | |
gnu: xygrib: Fix building with newer openjpeg.
* gnu/packages/geo.scm (xygrib)[source]: Adjust snippet to also search for newer openjpeg versions.
Diffstat (limited to 'gnu/packages/geo.scm')
| -rw-r--r-- | gnu/packages/geo.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 1337e8f20b..bff213d684 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018, 2019, 2020, 2021 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2019-2023 Guillaume Le Vaillant <glv@posteo.net> -;;; Copyright © 2019-2022 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2021 Wiktor Żelazny <wzelazny@vurv.cz> ;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> @@ -1663,11 +1663,13 @@ map display. Downloads map data from a number of websites, including ;; Upstream link: https://github.com/opengribs/XyGrib/pull/255 (substitute* "src/SkewT.h" (("QMessageBox>") "QMessageBox>\n#include <QPainterPath>")) - #t)))) + ;; Accept newer versions of openjpeg + ;; https://github.com/opengribs/XyGrib/pull/298 + (substitute* "CMakeLists.txt" + (("openjpeg-2.4") "openjpeg-2.5 openjpeg-2.4")))))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DGNU_PACKAGE=ON") - #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-directories |