guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: OpenEXR 2: Move the snippet into a build phase.


From: guix-commits
Subject: 02/02: gnu: OpenEXR 2: Move the snippet into a build phase.
Date: Mon, 25 Oct 2021 19:24:28 -0400 (EDT)

lfam pushed a commit to branch master
in repository guix.

commit de3bf035b4e42474355af3a4b110b54835098ac4
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Sat Oct 23 16:48:34 2021 -0400

    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.
---
 gnu/packages/graphics.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 6fc3240..222f500 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]