Merge pull request #135025 from NixOS/backport-134726-to-staging-21.05
[Backport staging-21.05] ffmpeg, ffmpeg-full: enable basic tests
This commit is contained in:
commit
275cdcb119
@ -443,6 +443,14 @@ stdenv.mkDerivation rec {
|
|||||||
buildFlags = [ "all" ]
|
buildFlags = [ "all" ]
|
||||||
++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable
|
++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
checkPhase = let
|
||||||
|
ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
|
||||||
|
in ''
|
||||||
|
${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \
|
||||||
|
make check -j$NIX_BUILD_CORES
|
||||||
|
'';
|
||||||
|
|
||||||
# Hacky framework patching technique borrowed from the phantomjs2 package
|
# Hacky framework patching technique borrowed from the phantomjs2 package
|
||||||
postInstall = optionalString qtFaststartProgram ''
|
postInstall = optionalString qtFaststartProgram ''
|
||||||
cp -a tools/qt-faststart $out/bin/
|
cp -a tools/qt-faststart $out/bin/
|
||||||
|
@ -7,4 +7,5 @@ callPackage ./generic.nix (rec {
|
|||||||
knownVulnerabilities = [
|
knownVulnerabilities = [
|
||||||
"CVE-2021-30123"
|
"CVE-2021-30123"
|
||||||
];
|
];
|
||||||
|
doCheck = false;
|
||||||
} // args)
|
} // args)
|
||||||
|
@ -17,7 +17,8 @@
|
|||||||
# Darwin frameworks
|
# Darwin frameworks
|
||||||
, Cocoa, darwinFrameworks ? [ Cocoa ]
|
, Cocoa, darwinFrameworks ? [ Cocoa ]
|
||||||
# Inherit generics
|
# Inherit generics
|
||||||
, branch, sha256, version, patches ? [], knownVulnerabilities ? [], ...
|
, branch, sha256, version, patches ? [], knownVulnerabilities ? []
|
||||||
|
, doCheck ? true, ...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
/* Maintainer notes:
|
/* Maintainer notes:
|
||||||
@ -187,7 +188,13 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
doCheck = false; # fails
|
inherit doCheck;
|
||||||
|
checkPhase = let
|
||||||
|
ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
|
||||||
|
in ''
|
||||||
|
${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \
|
||||||
|
make check -j$NIX_BUILD_CORES
|
||||||
|
'';
|
||||||
|
|
||||||
# ffmpeg 3+ generates pkg-config (.pc) files that don't have the
|
# ffmpeg 3+ generates pkg-config (.pc) files that don't have the
|
||||||
# form automatically handled by the multiple-outputs hooks.
|
# form automatically handled by the multiple-outputs hooks.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user