me
/
guix
Archived
1
0
Fork 0
Code

gnu: opencv: Fix installation. 

This is a follow-up to commit 5894b1210d.

* gnu/packages/image-processing.scm (opencv)[arguments]: Add build phase
'do-not-install-3rdparty-file.
master
Ricardo Wurmus 2021-12-21 10:26:22 +01:00
parent 2bbc3864c3
commit 21219307fe
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/image-processing.scm
View File

@ -498,15 +498,19 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
"../opencv-extra") "../opencv-extra")
(copy-recursively (assoc-ref inputs "opencv-contrib") (copy-recursively (assoc-ref inputs "opencv-contrib")
"../opencv-contrib"))) "../opencv-contrib")))
(add-before 'check 'start-xserver (add-after 'build 'do-not-install-3rdparty-file
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(let ((xorg-server (assoc-ref inputs "xorg-server")) (substitute* "cmake_install.cmake"
(disp ":1")) (("file\\(INSTALL .*source/3rdparty/include/opencl/LICENSE.txt.*") "\n"))))
(setenv "HOME" (getcwd)) (add-before 'check 'start-xserver
(setenv "DISPLAY" disp) (lambda* (#:key inputs #:allow-other-keys)
;; There must be a running X server and make check doesn't start one. (let ((xorg-server (assoc-ref inputs "xorg-server"))
;; Therefore we must do it. (disp ":1"))
(zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp))))))))) (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 (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server-for-tests) ; For running the tests ("xorg-server" ,xorg-server-for-tests) ; For running the tests