Merge pull request #188087 from jmesmon/vid-stab

vid-stab: 1.1.0 -> unstable-2022-05-30, fix linking against it with clang
This commit is contained in:
Mario Rodas 2022-09-17 11:28:25 -05:00 committed by GitHub
commit a5e503c3ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions

View File

@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "vid.stab";
version = "1.1.0";
version = "unstable-2022-05-30";
src = fetchFromGitHub {
owner = "georgmartius";
repo = pname;
rev = "v${version}";
sha256 = "0a3frpm2kdbx7vszhg64p3alisag73bcspl7fp3a2f1kgq7rbh38";
rev = "90c76aca2cb06c3ff6f7476a7cd6851b39436656";
sha256 = "sha256-p1VRnkBeUpET3O2FmaJMyN5/EoSOQLdmRIVbzZcQaKY=";
};
nativeBuildInputs = [ cmake ];
buildInputs = lib.optionals stdenv.cc.isClang [ openmp ];
propagatedBuildInputs = lib.optionals stdenv.cc.isClang [ openmp ];
meta = with lib; {
description = "Video stabilization library";

View File

@ -18175,7 +18175,6 @@ with pkgs;
libmfx = if stdenv.isDarwin then null else intel-media-sdk;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab;
inherit (darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
VideoDecodeAcceleration;