Add missing 'optional' packages
This commit is contained in:
parent
b705896d69
commit
0dcc6bc710
@ -1,4 +1,22 @@
|
|||||||
{ 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
|
||||||
|
, libjpeg
|
||||||
|
, libpng
|
||||||
|
, libtiff
|
||||||
|
, opencv
|
||||||
|
, openmp
|
||||||
|
, pkg-config
|
||||||
|
, stdenv
|
||||||
|
, vcg
|
||||||
|
, zstd
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
boostWithZstd = boost.overrideAttrs (old: {
|
boostWithZstd = boost.overrideAttrs (old: {
|
||||||
@ -20,7 +38,20 @@ stdenv.mkDerivation rec {
|
|||||||
# SSE is enabled by default
|
# SSE is enabled by default
|
||||||
cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF";
|
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
|
||||||
|
libjpeg
|
||||||
|
libpng
|
||||||
|
libtiff
|
||||||
|
opencv
|
||||||
|
openmp
|
||||||
|
vcg
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
||||||
|
@ -10297,7 +10297,9 @@ with pkgs;
|
|||||||
|
|
||||||
openmvg = callPackage ../applications/science/misc/openmvg { };
|
openmvg = callPackage ../applications/science/misc/openmvg { };
|
||||||
|
|
||||||
openmvs = callPackage ../applications/science/misc/openmvs { };
|
openmvs = callPackage ../applications/science/misc/openmvs {
|
||||||
|
inherit (llvmPackages) openmp;
|
||||||
|
};
|
||||||
|
|
||||||
openntpd = callPackage ../tools/networking/openntpd { };
|
openntpd = callPackage ../tools/networking/openntpd { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user