From 081eb4d8895424207fd0cb3131cf7c2dcc146202 Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Wed, 22 Feb 2023 12:14:01 +0100 Subject: [PATCH 1/2] openmvg: set target architecture to 'generic' Otherwise the resulting binaries are specialized for the machine they're built on (like -march=native) --- pkgs/applications/science/misc/openmvg/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 9bd4cf12db03..e83a13d165f0 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}" "-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}" + "-DTARGET_ARCHITECTURE=generic" ] ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON"; cmakeDir = "./src"; From ebc120c155ba811ba16a1721817a9fc177259227 Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Wed, 22 Feb 2023 12:27:49 +0100 Subject: [PATCH 2/2] openmvg: use ceres-solver from nixpkgs The vendored one gets built with -march=native --- pkgs/applications/science/misc/openmvg/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index e83a13d165f0..f9bcfa5df73c 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -4,6 +4,7 @@ , libpng ? null , eigen ? null , libtiff ? null +, ceres-solver , enableShared ? !stdenv.hostPlatform.isStatic , enableExamples ? false , enableDocs ? false }: @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ]; + buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ceres-solver ]; nativeBuildInputs = [ cmake pkg-config ];