From e92508baebebb4306779e6f4e2dff8c838b389cd Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Thu, 9 Jun 2022 13:53:33 -0700
Subject: gnu: vtk@7: Do not embed running kernel version.
* gnu/packages/image-processing.scm (vtk-7)[arguments]: Add
'remove-kernel-version phase.
---
gnu/packages/image-processing.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
(limited to 'gnu/packages/image-processing.scm')
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index f4bf1724b4..0c7bae183c 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -435,7 +435,16 @@ (define-public vtk-7
((#:configure-flags flags)
;; Otherwise, the build would fail with: "error: invalid conversion
;; from ‘const char*’ to ‘char*’ [-fpermissive]".
- `(cons "-DCMAKE_CXX_FLAGS=-fpermissive" ,flags))))))
+ `(cons "-DCMAKE_CXX_FLAGS=-fpermissive" ,flags))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'remove-kernel-version
+ ;; Avoid embedding the kernel version for reproducible builds
+ (lambda _
+ (substitute*
+ "ThirdParty/hdf5/vtkhdf5/config/cmake/libhdf5.settings.cmake.in"
+ (("Host system: .CMAKE_HOST_SYSTEM.")
+ "Host system: @CMAKE_SYSTEM_NAME@"))))))))))
(define-public opencv
(package
--
cgit v1.2.3
From f2e570ca8a9349d706828cee9012b75dbd87c257 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 5 Jun 2022 02:00:00 +0200
Subject: gnu: vtk@7: Simplify regular expression.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/image-processing.scm (vtk-7)[arguments]: Replace ‘.’
wildcards with literal ‘@’ character matches.
---
gnu/packages/image-processing.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gnu/packages/image-processing.scm')
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 0c7bae183c..0c25b41dad 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -443,7 +443,7 @@ (define-public vtk-7
(lambda _
(substitute*
"ThirdParty/hdf5/vtkhdf5/config/cmake/libhdf5.settings.cmake.in"
- (("Host system: .CMAKE_HOST_SYSTEM.")
+ (("Host system: \\@CMAKE_HOST_SYSTEM\\@")
"Host system: @CMAKE_SYSTEM_NAME@"))))))))))
(define-public opencv
--
cgit v1.2.3