[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: opencv: Fix installation.
From: |
guix-commits |
Subject: |
branch master updated: gnu: opencv: Fix installation. |
Date: |
Tue, 21 Dec 2021 04:32:07 -0500 |
This is an automated email from the git hooks/post-receive script.
rekado pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 2121930 gnu: opencv: Fix installation.
2121930 is described below
commit 21219307febfd6a9ed6036fdf0d78194292a3e14
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Tue Dec 21 10:26:22 2021 +0100
gnu: opencv: Fix installation.
This is a follow-up to commit 5894b1210d689ec408db21184b85b0a6a1a5ca3e.
* gnu/packages/image-processing.scm (opencv)[arguments]: Add build phase
'do-not-install-3rdparty-file.
---
gnu/packages/image-processing.scm | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/image-processing.scm
b/gnu/packages/image-processing.scm
index 3281618..0460478 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -498,15 +498,19 @@ integrates with various databases on GUI toolkits such as
Qt and Tk.")
"../opencv-extra")
(copy-recursively (assoc-ref inputs "opencv-contrib")
"../opencv-contrib")))
- (add-before 'check 'start-xserver
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xorg-server (assoc-ref inputs "xorg-server"))
- (disp ":1"))
- (setenv "HOME" (getcwd))
- (setenv "DISPLAY" disp)
- ;; There must be a running X server and make check doesn't start
one.
- ;; Therefore we must do it.
- (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server
disp)))))))))
+ (add-after 'build 'do-not-install-3rdparty-file
+ (lambda _
+ (substitute* "cmake_install.cmake"
+ (("file\\(INSTALL
.*source/3rdparty/include/opencl/LICENSE.txt.*") "\n"))))
+ (add-before 'check 'start-xserver
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xorg-server (assoc-ref inputs "xorg-server"))
+ (disp ":1"))
+ (setenv "HOME" (getcwd))
+ (setenv "DISPLAY" disp)
+ ;; There must be a running X server and make check doesn't
start one.
+ ;; Therefore we must do it.
+ (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server
disp)))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server-for-tests) ; For running the tests
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: opencv: Fix installation.,
guix-commits <=