summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2021-10-23 16:48:34 -0400
committerLeo Famulari <leo@famulari.name>2021-10-25 19:24:02 -0400
commitde3bf035b4e42474355af3a4b110b54835098ac4 (patch)
tree20e37cac42f82ae4bcb759b7df10c5dc72dbc465 /gnu
parent547009ff0acdb0a16ed24bbedfa35d6c107d4721 (diff)
downloadguix-de3bf035b4e42474355af3a4b110b54835098ac4.tar.gz
gnu: OpenEXR 2: Move the snippet into a build phase.
This snippet was just working around a quirk of the Guix build environment.

* gnu/packages/graphics.scm (openexr-2)[origin]: Remove snippet.
[arguments]: Add a 'patch-test-directory' phase.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/graphics.scm15
1 files changed, 7 insertions, 8 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 6fc324012d..222f500445 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1148,14 +1148,7 @@ with strong support for multi-part, multi-channel use cases.")
     (version (package-version ilmbase))
     (source (origin
               (inherit (package-source ilmbase))
-              (file-name (git-file-name "openexr" version))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (substitute* (find-files "OpenEXR" "tmpDir\\.h")
-                    (("\"/var/tmp/\"")
-                     "\"/tmp/\""))
-                  #t))))
+              (file-name (git-file-name "openexr" version))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases
@@ -1164,6 +1157,12 @@ with strong support for multi-part, multi-channel use cases.")
            (lambda _
              (chdir "OpenEXR")
              #t))
+         (add-after 'change-directory 'patch-test-directory
+           (lambda _
+             (substitute* '("IlmImfFuzzTest/tmpDir.h"
+                            "IlmImfTest/tmpDir.h"
+                            "IlmImfUtilTest/tmpDir.h")
+               (("/var/tmp") "/tmp"))))
          (add-after 'change-directory 'increase-test-timeout
            (lambda _
              ;; On armhf-linux, we need to override the CTest default