From dd77c796d23a4eacec26cea139ab02c38363cba5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 8 Feb 2026 12:13:34 +0700
Subject: [PATCH 1/3] openmvs: 2.2.0 -> 2.4.0

---
 .../science/misc/openmvs/default.nix          | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index 2832a52e5dc4..350ce14a0f01 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -8,13 +8,16 @@
   fetchFromGitHub,
   glfw,
   gmp,
+  libjxl,
   libjpeg,
   libpng,
   libtiff,
   mpfr,
+  nanoflann,
   opencv,
   openmp,
   pkg-config,
+  python3Packages,
   stdenv,
   vcg,
   zstd,
@@ -26,19 +29,22 @@ let
   });
 in
 stdenv.mkDerivation rec {
-  version = "2.2.0";
+  version = "2.4.0";
   pname = "openmvs";
 
   src = fetchFromGitHub {
     owner = "cdcseacave";
     repo = "openmvs";
     rev = "v${version}";
-    hash = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8=";
+    hash = "sha256-0tL2tqHYBQMGL9k+NqTUxieWuDP3YB6X9DcXYnlGWWg=";
     fetchSubmodules = true;
   };
 
   # SSE is enabled by default
-  cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86_64) "-DOpenMVS_USE_SSE=OFF";
+  cmakeFlags = [
+    (lib.cmakeFeature "Python3_EXECUTABLE" (lib.getExe python3Packages.python))
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isx86_64) "-DOpenMVS_USE_SSE=OFF";
 
   buildInputs = [
     boostWithZstd
@@ -47,10 +53,12 @@ stdenv.mkDerivation rec {
     eigen
     glfw
     gmp
+    libjxl
     libjpeg
     libpng
     libtiff
     mpfr
+    nanoflann
     opencv
     openmp
     vcg
@@ -59,6 +67,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    python3Packages.python
   ];
 
   postInstall = ''
@@ -69,6 +78,16 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  checkPhase = ''
+    runHook preCheck
+    ${lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ''
+      export KMP_AFFINITY=disabled
+      export OMP_PROC_BIND=false
+    ''}
+    ctest --output-on-failure
+    runHook postCheck
+  '';
+
   meta = {
     description = "Open Multi-View Stereo reconstruction library";
     homepage = "https://github.com/cdcseacave/openMVS";

From 913ecae0ad6329e329e9c90eca2d94d10d215a40 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 8 Feb 2026 16:16:10 +0700
Subject: [PATCH 2/3] openmvs: add miniharinn as a maintainer

---
 pkgs/applications/science/misc/openmvs/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index 350ce14a0f01..dad099bf11b3 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -93,6 +93,9 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/cdcseacave/openMVS";
     license = lib.licenses.agpl3Only;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ bouk ];
+    maintainers = with lib.maintainers; [
+      bouk
+      miniharinn
+    ];
   };
 }

From 28b77c3038b643f48b5c5a2bb63e05d8a9147e1b Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Tue, 24 Mar 2026 01:28:36 +0700
Subject: [PATCH 3/3] openmvs: fix build with boost 1.89

---
 pkgs/applications/science/misc/openmvs/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix
index dad099bf11b3..ff6d7bf9faac 100644
--- a/pkgs/applications/science/misc/openmvs/default.nix
+++ b/pkgs/applications/science/misc/openmvs/default.nix
@@ -46,6 +46,12 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optional (!stdenv.hostPlatform.isx86_64) "-DOpenMVS_USE_SSE=OFF";
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'FIND_PACKAGE(Boost REQUIRED COMPONENTS iostreams program_options system serialization OPTIONAL_COMPONENTS ''${Boost_EXTRA_COMPONENTS})' \
+      'FIND_PACKAGE(Boost REQUIRED COMPONENTS iostreams program_options serialization OPTIONAL_COMPONENTS ''${Boost_EXTRA_COMPONENTS})'
+  '';
+
   buildInputs = [
     boostWithZstd
     ceres-solver