public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85330 from chkno/openmvg

Browse Source 
openmvg: 1.3 -> 1.5 (unbreak)
This commit is contained in:
Daniël de Kok 2020-08-16 09:39:38 +02:00 committed by GitHub
commit 3ab2bf69ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/science/misc/openmvg/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, cmake { stdenv, fetchFromGitHub, pkgconfig, cmake
, libjpeg ? null , libjpeg ? null
, zlib ? null , zlib ? null
, libpng ? null , libpng ? null
@ -8,15 +8,14 @@
, enableDocs ? false }: , enableDocs ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.3"; version = "1.6";
pname = "openmvg"; pname = "openmvg";
src = fetchgit { src = fetchFromGitHub {
url = "https://www.github.com/openmvg/openmvg.git"; owner = "openmvg";
repo = "openmvg";
# Tag v1.1 rev = "v${version}";
rev = "refs/tags/v${version}"; sha256 = "0mrsi0dzgi7cjzn13r9xv7rnc8c9a4h8ip78xy88m9xsyr21wd1h";
sha256 = "1cf1gbcl8zvxp4rr6f6vaxwcg0yzc4xban2b5p9zy1m4k1f81zyb";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -46,6 +45,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mpl20; license = stdenv.lib.licenses.mpl20;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ mdaiter ]; maintainers = with stdenv.lib.maintainers; [ mdaiter ];
broken = true; # 2018-04-11
}; };
} }