alice-vision: default to 3.1.0, enable alignment and full optimizatio…

…n when possible
NixOS · Oct 4, 2023 · fdce462 · fdce462
1 parent c47846f
commit fdce462
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pkgs/development/libraries/alice-vision/3.1.0.nix b/pkgs/development/libraries/alice-vision/3.1.0.nix
@@ -120,9 +120,6 @@ stdenv.mkDerivation rec {
       --replace \
         'alicevision_add_test(matching_test.cpp NAME "matching"          LINKS aliceVision_matching)' \
         'alicevision_add_test(matching_test.cpp NAME "matching"          LINKS aliceVision_matching lz4)'
-  '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") ''
-    # -O3 currently causes segmentation faults on x86_64-linux
-    sed -i 's/-O3/-O2/' src/CMakeLists.txt
   '';
 
   # Disable warning causing compile error on certain Clang versions
@@ -154,8 +151,9 @@ stdenv.mkDerivation rec {
         ALICEVISION_BUILD_DOC = false;
         ALICEVISION_BUILD_EXAMPLES = false;
         ALICEVISION_BUILD_SOFTWARE = true;
-        # enabled alignment led to wrong initialization of Vec2 variables
-        AV_EIGEN_MEMORY_ALIGNMENT = false;
+        # CCTag package does not support alignment yet, and this must be
+        # consistent between both packages
+        AV_EIGEN_MEMORY_ALIGNMENT = ! enableCctag;
 
         ALICEVISION_BUILD_TESTS = doCheck;
 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -20698,7 +20698,7 @@ with pkgs;
 
   alass = callPackage ../applications/video/alass { };
 
-  alice-vision = alice-vision_3_0_0;
+  alice-vision = alice-vision_3_1_0;
 
   alice-vision_3_0_0 = callPackage ../development/libraries/alice-vision/3.0.0.nix {
     inherit (llvmPackages) openmp;