diff options
| author | Matthew Daiter <mdaiter8121@gmail.com> | 2017-05-12 21:07:11 +0200 |
|---|---|---|
| committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-05-12 20:07:11 +0100 |
| commit | 093130f8027f442826a4ab4d8dfff812c65529df (patch) | |
| tree | 94edf96f0b65ec534a95ded533e5c66d5137719e /pkgs | |
| parent | c9f8fb4d127aa50cbe8905a1686b1ed88754a9b7 (diff) | |
| download | nixpkgs-093130f8027f442826a4ab4d8dfff812c65529df.tar nixpkgs-093130f8027f442826a4ab4d8dfff812c65529df.tar.gz nixpkgs-093130f8027f442826a4ab4d8dfff812c65529df.tar.bz2 nixpkgs-093130f8027f442826a4ab4d8dfff812c65529df.tar.lz nixpkgs-093130f8027f442826a4ab4d8dfff812c65529df.tar.xz nixpkgs-093130f8027f442826a4ab4d8dfff812c65529df.tar.zst nixpkgs-093130f8027f442826a4ab4d8dfff812c65529df.zip | |
openmvs: init at current master (#25672)
* openmvs: init at current master * openmvs: simplify expression * openmvs: init at unstable-2017-05-01
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/misc/openmvs/default.nix | 45 | ||||
| -rw-r--r-- | pkgs/development/libraries/vcg/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 55 insertions, 6 deletions
diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix new file mode 100644 index 00000000000..177f8ca2564 --- /dev/null +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +, eigen, opencv, ceres-solver, cgal, boost, vcg +, gmp, mpfr, glog, google-gflags, libjpeg_turbo }: + +stdenv.mkDerivation rec { + name = "openmvs-unstable-2017-05-01"; + + src = fetchFromGitHub { + owner = "cdcseacave"; + repo = "openmvs"; + + rev = "a3b360016660a1397f6eb6c070c2c19bbb4c7590"; + sha256 = "170ff4ipix2kqq5rhb1yrrcvc79im9qgp5hiwsdr23xxzdl21221"; + }; + + buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + preConfigure = '' + cmakeFlagsArray=( + $cmakeFlagsArray + "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_STATIC_RUNTIME=ON" + "-DINSTALL_BIN_DIR=$out/bin" + "-DVCG_DIR=${vcg}" + "-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/" + ) + ''; + + cmakeDir = "./"; + + dontUseCmakeBuildDir = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A library for computer-vision scientists and especially targeted to the Multi-View Stereo reconstruction community"; + homepage = http://cdcseacave.github.io/openMVS/; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ mdaiter ]; + }; +} diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index 9e85ad7413d..6225fb18e28 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchsvn, eigen }: +{ stdenv, fetchFromGitHub, eigen }: stdenv.mkDerivation rec { - name = "vcg-2016-02-14"; + name = "vcg-${version}"; + version = "1.0.1"; - src = fetchsvn { - url = "svn://svn.code.sf.net/p/vcg/code/trunk/vcglib"; - rev = 5688; - sha256 = "0hkvz2d8prrjdcc7h0xhfd9hq86lmqg17ml045x4bkiciimx0w5s"; + src = fetchFromGitHub { + owner = "cnr-isti-vclab"; + repo = "vcglib"; + rev = "v${version}"; + sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; }; propagatedBuildInputs = [ eigen ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8609b162558..fdec62a06f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3331,6 +3331,8 @@ with pkgs; openmvg = callPackage ../applications/science/misc/openmvg { }; + openmvs = callPackage ../applications/science/misc/openmvs { }; + openntpd = callPackage ../tools/networking/openntpd { }; openntpd_nixos = openntpd.override { |