Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pkgs/development/libraries/cctag/cmake-install-include-dir.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -209,7 +209,7 @@
target_include_directories(CCTag
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>"
"$<BUILD_INTERFACE:${generated_dir}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>"
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
PUBLIC ${Boost_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})

# just for testing
66 changes: 66 additions & 0 deletions pkgs/development/libraries/cctag/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{ lib
, stdenv
, fetchFromGitHub

, cmake
, boost
, eigen
, opencv
, tbb

, avx2Support ? stdenv.hostPlatform.avx2Support
}:

stdenv.mkDerivation rec {
pname = "cctag";
version = "1.0.3";

outputs = [ "lib" "dev" "out" ];

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
outputs = [ "lib" "dev" "out" ];
outputs = [ "out" "lib" "dev" ];

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that really a good idea? cctag.out is empty (it's only included because some hooks complain otherwise). cctag.lib really is the main binary output.
If cctag.lib were to go first, building cctag would default to an empty output which would be somewhat counterintuitive.
Not sure if there are any policies surrounding this other than "binaries should go first"


src = fetchFromGitHub {
owner = "alicevision";
repo = "CCTag";
rev = "v${version}";
hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A=";
};

cmakeFlags = [
# Feel free to create a PR to add CUDA support
"-DCCTAG_WITH_CUDA=OFF"

"-DCCTAG_ENABLE_SIMD_AVX2=${if avx2Support then "ON" else "OFF"}"

"-DCCTAG_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
"-DCCTAG_BUILD_APPS=OFF"
];

patches = [
./cmake-install-include-dir.patch
Comment thread
davidak marked this conversation as resolved.
Outdated
];

nativeBuildInputs = [
cmake
];

propagatedBuildInputs = [
tbb
];

buildInputs = [
boost
eigen
opencv
];

# Tests are broken on Darwin (linking issue)
doCheck = !stdenv.isDarwin;

meta = with lib; {
description = "Detection of CCTag markers made up of concentric circles";
homepage = "https://cctag.readthedocs.io";
Comment thread
hesiod marked this conversation as resolved.
Outdated
downloadPage = "https://github.com/alicevision/CCTag";
license = licenses.mpl20;
platforms = platforms.all;
Comment thread
davidak marked this conversation as resolved.
Outdated
maintainers = with maintainers; [ tmarkus ];
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19447,6 +19447,10 @@ with pkgs;

ccrtp = callPackage ../development/libraries/ccrtp { };

cctag = callPackage ../development/libraries/cctag {
tbb = tbb_2021_8;
};

cctz = callPackage ../development/libraries/cctz {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
Expand Down