Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: af87b922f1af
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 587ed894a429
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 5, 2017

  1. openmvg: init at v1.1

    @mdaiter
    mdaiter authored and mdaiter committed May 5, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c6385eb View commit details

  2. Merge pull request #25480 from mdaiter/openmvg 

    openmvg: init at v1.1
    @7c6f434c
    7c6f434c authored May 5, 2017
    Copy the full SHA
    587ed89 View commit details
Showing with 52 additions and 0 deletions.
  1. +50 −0 pkgs/applications/science/misc/openmvg/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
50 changes: 50 additions & 0 deletions pkgs/applications/science/misc/openmvg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{ lib, stdenv, fetchgit, pkgconfig, cmake
, libjpeg ? null
, zlib ? null
, libpng ? null
, eigen ? null
, libtiff ? null
, enableExamples ? false
, enableDocs ? false }:

stdenv.mkDerivation rec {
version = "1.1";
name = "openmvg-${version}";

src = fetchgit {
url = "https://www.github.com/openmvg/openmvg.git";

# Tag v1.1
rev = "f5ecb48";
sha256 = "1di9i7yxnkdvl8lhflynmqw62gaxwv00r1sd7nzzs9qn63g0af0f";
fetchSubmodules = true;
};

buildInputs = [ libjpeg zlib libpng eigen libtiff ];

nativeBuildInputs = [ cmake pkgconfig ];

cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
"-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}"
"-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}"
];

cmakeDir = "./src";

dontUseCmakeBuildDir = true;

# This can be enabled, but it will exhause virtual memory on most machines.
enableParallelBuilding = false;

# Without hardeningDisable, certain flags are passed to the compile that break the build (primarily string format errors)
hardeningDisable = [ "all" ];

meta = {
description = "A library for computer-vision scientists and targeted for the Multiple View Geometry community";
homepage = http://openmvg.readthedocs.io/en/latest/;
license = stdenv.lib.licenses.mpl20;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ mdaiter ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3305,6 +3305,8 @@ with pkgs;

openjade = callPackage ../tools/text/sgml/openjade { };

openmvg = callPackage ../applications/science/misc/openmvg { };

openntpd = callPackage ../tools/networking/openntpd { };

openntpd_nixos = openntpd.override {