diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-01-14 10:01:52 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-01-14 15:07:41 +0200 |
| commit | b5baf9529e65c2aff07375e26d5c860b68ca0bb9 (patch) | |
| tree | 0daf52d99a9ee313124c1c5f26a10e8144dbce6a /gnu/packages | |
| parent | 6949f45c105fe75d424420becf854030bf382378 (diff) | |
| download | gnu-guix-b5baf9529e65c2aff07375e26d5c860b68ca0bb9.tar gnu-guix-b5baf9529e65c2aff07375e26d5c860b68ca0bb9.tar.gz | |
gnu: opencv: Don't hardcode build directories.
* gnu/packages/image-processing.scm (opencv)[arguments]: Change
OPENCV_EXTRA_MODULES_PATH and OPENCV_TEST_DATA_PATH to use 'getcwd'
instead of hardcoding the build path.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/image-processing.scm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 9be9ced927..a27da6a43b 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -255,15 +255,12 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") "-DBUILD_PERF_TESTS=OFF" "-DBUILD_TESTS=ON" - (string-append "-DOPENCV_EXTRA_MODULES_PATH=" - "/tmp/guix-build-opencv-" ,version ".drv-0" + (string-append "-DOPENCV_EXTRA_MODULES_PATH=" (getcwd) "/opencv-contrib/opencv_contrib-" ,version "/modules") ;;Define test data: - (string-append "-DOPENCV_TEST_DATA_PATH=" - "/tmp/guix-build-opencv-" ,version ".drv-0" - ;;"/opencv-3.4.0" + (string-append "-DOPENCV_TEST_DATA_PATH=" (getcwd) "/opencv-extra/opencv_extra-" ,version "/testdata") |