jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #212266 from bouk/openmvg-dependencies

Browse Source 
openmvg: add missing dependencies
This commit is contained in:
Weijia Wang 2023-01-24 16:08:07 +01:00 committed by GitHub
commit 4698e57666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

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