diff --git a/pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch b/pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch new file mode 100644 index 000000000000..5884e39ad651 --- /dev/null +++ b/pkgs/development/libraries/cctag/cmake-no-apple-rpath.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d0e35b6..fc19477 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,20 +96,6 @@ endif() + # set the path where we can find the findXXX.cmake + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake") + +-if(APPLE) +- +- # avoid the cmake policy warning about @rpath in MacOSX +- cmake_policy(SET CMP0042 NEW) +- +- SET(CMAKE_MACOSX_RPATH TRUE) # initialize the MACOSX_RPATH property on all targets +- SET(CMAKE_SKIP_BUILD_RPATH FALSE) # don't skip the full RPATH for the build tree +- # SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) # when building, don't use the install RPATH already +- SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) # when building, use the install RPATH already +- # probably not needed +- # SET(CMAKE_INSTALL_RPATH "") # the RPATH to be used when installing +- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # LC_RPATH for CUDA and OpenCV etc written into executable +-endif(APPLE) +- + # FIND BOOST + set(BOOST_REQUIRED_COMPONENTS "atomic;chrono;date_time;filesystem;program_options;serialization;system;thread;timer;math_c99") + if(WIN32) + diff --git a/pkgs/development/libraries/cctag/default.nix b/pkgs/development/libraries/cctag/default.nix index 557f88090405..28a8bb3c3dc9 100644 --- a/pkgs/development/libraries/cctag/default.nix +++ b/pkgs/development/libraries/cctag/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, - boost179, + boost, eigen, opencv, tbb, @@ -14,19 +14,18 @@ stdenv.mkDerivation rec { pname = "cctag"; - version = "1.0.3"; + version = "1.0.4"; outputs = [ - "lib" - "dev" "out" + "dev" ]; src = fetchFromGitHub { owner = "alicevision"; repo = "CCTag"; rev = "v${version}"; - hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A="; + hash = "sha256-M35KGTTmwGwXefsFWB2UKAKveUQyZBW7V8ejgOAJpXk="; }; cmakeFlags = [ @@ -41,8 +40,15 @@ stdenv.mkDerivation rec { patches = [ ./cmake-install-include-dir.patch + ./cmake-no-apple-rpath.patch ]; + # darwin boost doesn't have math_c99 libraries + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace CMakeLists.txt --replace-warn ";math_c99" "" + substituteInPlace src/CMakeLists.txt --replace-warn "Boost::math_c99" "" + ''; + nativeBuildInputs = [ cmake ]; @@ -52,13 +58,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost179 + boost eigen opencv.cxxdev ]; - # Tests are broken on Darwin (linking issue) - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = true; meta = with lib; { description = "Detection of CCTag markers made up of concentric circles";