vid-stab: 1.1.0 -> unstable-2022-05-30, fix linking against it with clang
- vid-stab 1.1.0 (current release) hardcodes libgomp in its pkg-config. Current git version includes a commit fixing this, so this change updates to the git versions - placing openmp in `buildInputs` causes it not to be present when linking against vid-stab, causing linking to fail. Move it to `propagatedBuildInputs` to resolve - the all-packages.nix change enables vid-stab in (for example) ffmpeg on macos (where it was previously disabled).
This commit is contained in:
parent
f36ab16d7a
commit
06b6e303b0
2 changed files with 4 additions and 5 deletions
|
@ -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";
|
||||
|
|
|
@ -17846,7 +17846,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;
|
||||
|
|
Loading…
Reference in a new issue