Commit 37abe674 authored by Bouke van der Bijl's avatar Bouke van der Bijl
Browse files

openmvg: add missing dependencies 

* Use external cereal
* Add openmp for parallel processing
* Add bouk as maintainer
parent 2b34081c

pkgs/applications/science/misc/openmvg/default.nix

+3 −3
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };