pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #212242 from bouk/openmvs-fix-bins

openmvs: move binaries to correct location

authored by Guillaume Girol and committed by GitHub 325aba25 a100acd7

+53 -3
unified split
+50 -2
pkgs/applications/science/misc/openmvs/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, pkg-config, cmake, eigen, opencv, cgal, ceres-solver, boost, vcg, glfw, zstd }: 1 + { lib 2 + , boost 3 + , breakpad 4 + , ceres-solver 5 + , cgal 6 + , cmake 7 + , eigen 8 + , fetchFromGitHub 9 + , glfw 10 + , gmp 11 + , libjpeg 12 + , libpng 13 + , libtiff 14 + , mpfr 15 + , opencv 16 + , openmp 17 + , pkg-config 18 + , stdenv 19 + , vcg 20 + , zstd 21 + }: 2 22 3 23 let 4 24 boostWithZstd = boost.overrideAttrs (old: { ··· 20 40 # SSE is enabled by default 21 41 cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; 22 42 23 - buildInputs = [ eigen opencv cgal ceres-solver vcg glfw boostWithZstd ]; 43 + buildInputs = [ 44 + boostWithZstd 45 + breakpad 46 + ceres-solver 47 + cgal 48 + eigen 49 + glfw 50 + gmp 51 + libjpeg 52 + libpng 53 + libtiff 54 + mpfr 55 + opencv 56 + openmp 57 + vcg 58 + ]; 24 59 25 60 nativeBuildInputs = [ cmake pkg-config ]; 61 + 62 + postInstall = '' 63 + mv $out/bin/OpenMVS/* $out/bin 64 + rmdir $out/bin/OpenMVS 65 + rm $out/bin/Tests 66 + ''; 67 + 68 + doCheck = true; 69 + checkPhase = '' 70 + runHook preCheck 71 + ctest 72 + runHook postCheck 73 + ''; 26 74 27 75 meta = { 28 76 description = "Open Multi-View Stereo reconstruction library";
+3 -1
pkgs/top-level/all-packages.nix
··· 10400 10400 inherit (llvmPackages) openmp; 10401 10401 }; 10402 10402 10403 - openmvs = callPackage ../applications/science/misc/openmvs { }; 10403 + openmvs = callPackage ../applications/science/misc/openmvs { 10404 + inherit (llvmPackages) openmp; 10405 + }; 10404 10406 10405 10407 openntpd = callPackage ../tools/networking/openntpd { }; 10406 10408