diff options
| author | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-07-11 14:24:31 +0800 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:45:41 +0200 |
| commit | 319ce074faf223c2944e155aece35f35da5a2369 (patch) | |
| tree | 57c7acd9ffd32b80bb5b064ce68c525117bae2d5 | |
| parent | c2893113363f20f4255b0aadbc4dd094093f1c5f (diff) | |
| download | guix-319ce074faf223c2944e155aece35f35da5a2369.tar.gz guix-319ce074faf223c2944e155aece35f35da5a2369.zip | |
gnu: openimageio: Fix build.
This fixes <https://issues.guix.gnu.org/72046>.
* gnu/packages/graphics.scm (openimageio)[arguments]<#:phases>: Add
fix-zlib-version phase.
Change-Id: I7ea6e7b7da675bf11a85381cbe26c6992f2bd299
| -rw-r--r-- | gnu/packages/gnome.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/graphics.scm | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2c16e33292..af46d352ee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7257,6 +7257,10 @@ almost all of them.") (replace 'check (lambda* (#:key parallel-tests? tests? #:allow-other-keys) (when tests? + (setenv "XDG_RUNTIME_DIR" (string-append (getcwd) + "/runtime-dir")) + (mkdir (getenv "XDG_RUNTIME_DIR")) + (chmod (getenv "XDG_RUNTIME_DIR") #o700) (setenv "MESON_TESTTHREADS" (if parallel-tests? (number->string (parallel-job-count)) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index a0d7ec8df1..f112af57b3 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1350,7 +1350,17 @@ with strong support for multi-part, multi-channel use cases.") (arguments (list #:tests? #f ; half the tests require online data or use redirection #:configure-flags #~(list "-DUSE_EXTERNAL_PUGIXML=1" - "-DOIIO_BUILD_TESTS=false"))) + "-DOIIO_BUILD_TESTS=false") + #:phases + #~(modify-phases %standard-phases + ; Work around a CMake Zlib-detection bug: + ; https://issues.guix.gnu.org/72046 + ; https://gitlab.kitware.com/cmake/cmake/-/issues/25200 + (add-after 'configure 'fix-zlib-version + (lambda _ + (substitute* "include/imageio_pvt.h" + (("#define ZLIB_VERSION \"1\\.3\"") + ""))))))) (native-inputs (list pkg-config)) (inputs |