cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #96219 from marsam/update-vid-stab

Browse source 
vid-stab: 0.98b -> 1.1.0
This commit is contained in:
Mario Rodas 2020-08-25 20:39:34 -05:00 committed by GitHub
commit be6de91c7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/libraries/vid-stab/default.nix
View file

@ -1,22 +1,25 @@
{ stdenv, fetchurl, cmake }:
{ stdenv, fetchFromGitHub, cmake, openmp }:
stdenv.mkDerivation rec {
pname = "vid-stab";
version = "0.98b";
src = fetchurl {
url = "https://github.com/georgmartius/vid.stab/archive/release-${version}.tar.gz";
sha256 = "09fh6xbd1f5xp3il3dpvr87skmnp2mm2hfmg4s9rvj4y8zvhn3sk";
pname = "vid.stab";
version = "1.1.0";
src = fetchFromGitHub {
owner = "georgmartius";
repo = pname;
rev = "v${version}";
sha256 = "0a3frpm2kdbx7vszhg64p3alisag73bcspl7fp3a2f1kgq7rbh38";
};
nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ openmp ];
meta = with stdenv.lib; {
description = "Video stabilization library";
homepage = "http://public.hronopik.de/vid.stab/";
license = licenses.gpl2;
homepage = "http://public.hronopik.de/vid.stab/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ codyopel ];
platforms = platforms.all;
platforms = platforms.all;
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -15533,7 +15533,9 @@ in
vcg = callPackage ../development/libraries/vcg { };
vid-stab = callPackage ../development/libraries/vid-stab { };
vid-stab = callPackage ../development/libraries/vid-stab {
inherit (llvmPackages) openmp;
};
vigra = callPackage ../development/libraries/vigra { };