Merge pull request #212266 from bouk/openmvg-dependencies
openmvg: add missing dependencies
This commit is contained in:
commit
4698e57666
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, cereal, openmp
|
||||
, libjpeg ? null
|
||||
, zlib ? null
|
||||
, libpng ? null
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [ libjpeg zlib libpng eigen libtiff ];
|
||||
buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://openmvg.readthedocs.io/en/latest/";
|
||||
license = lib.licenses.mpl20;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ mdaiter ];
|
||||
maintainers = with lib.maintainers; [ mdaiter bouk ];
|
||||
};
|
||||
}
|
||||
|
@ -10298,7 +10298,9 @@ with pkgs;
|
||||
|
||||
openimagedenoise_1_2_x = callPackage ../development/libraries/openimagedenoise/1_2_x.nix { };
|
||||
|
||||
openmvg = callPackage ../applications/science/misc/openmvg { };
|
||||
openmvg = callPackage ../applications/science/misc/openmvg {
|
||||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
|
||||
openmvs = callPackage ../applications/science/misc/openmvs { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user