diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 031f1655b0af..fde756181cca 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -1,4 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, eigen, opencv, cgal, ceres-solver, boost, vcg, glfw, zstd }: +{ lib +, boost +, breakpad +, ceres-solver +, cgal +, cmake +, eigen +, fetchFromGitHub +, glfw +, gmp +, libjpeg +, libpng +, libtiff +, mpfr +, opencv +, openmp +, pkg-config +, stdenv +, vcg +, zstd +}: let boostWithZstd = boost.overrideAttrs (old: { @@ -20,10 +40,38 @@ stdenv.mkDerivation rec { # SSE is enabled by default cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; - buildInputs = [ eigen opencv cgal ceres-solver vcg glfw boostWithZstd ]; + buildInputs = [ + boostWithZstd + breakpad + ceres-solver + cgal + eigen + glfw + gmp + libjpeg + libpng + libtiff + mpfr + opencv + openmp + vcg + ]; nativeBuildInputs = [ cmake pkg-config ]; + postInstall = '' + mv $out/bin/OpenMVS/* $out/bin + rmdir $out/bin/OpenMVS + rm $out/bin/Tests + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + ctest + runHook postCheck + ''; + meta = { description = "Open Multi-View Stereo reconstruction library"; homepage = "https://github.com/cdcseacave/openMVS"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67db500b9612..547cb98940bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10400,7 +10400,9 @@ with pkgs; inherit (llvmPackages) openmp; }; - openmvs = callPackage ../applications/science/misc/openmvs { }; + openmvs = callPackage ../applications/science/misc/openmvs { + inherit (llvmPackages) openmp; + }; openntpd = callPackage ../tools/networking/openntpd { };