From b5baf9529e65c2aff07375e26d5c860b68ca0bb9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 14 Jan 2019 10:01:52 +0200 Subject: 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. --- gnu/packages/image-processing.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu') 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") -- cgit v1.2.3