ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 01:57:37 +03:00
Code Issues Projects Releases Wiki Activity

openmvg: add missing dependencies

Browse Source 
* Use external cereal
* Add openmp for parallel processing
* Add bouk as maintainer
This commit is contained in:
Bouke van der Bijl 2023-01-23 14:46:58 +01:00
parent 2b34081c80
commit 37abe67414
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/science/misc/openmvg/default.nix
View File

@ -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 ];
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -10295,7 +10295,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 { };