Revert "[Backport staging-21.05] ffmpeg, ffmpeg-full: enable basic tests"
This commit is contained in:
parent
a936d2f6ab
commit
efedf9a09e
|
@ -443,14 +443,6 @@ stdenv.mkDerivation rec {
|
|||
buildFlags = [ "all" ]
|
||||
++ 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
|
||||
postInstall = optionalString qtFaststartProgram ''
|
||||
cp -a tools/qt-faststart $out/bin/
|
||||
|
|
|
@ -7,5 +7,4 @@ callPackage ./generic.nix (rec {
|
|||
knownVulnerabilities = [
|
||||
"CVE-2021-30123"
|
||||
];
|
||||
doCheck = false;
|
||||
} // args)
|
||||
|
|
|
@ -17,8 +17,7 @@
|
|||
# Darwin frameworks
|
||||
, Cocoa, darwinFrameworks ? [ Cocoa ]
|
||||
# Inherit generics
|
||||
, branch, sha256, version, patches ? [], knownVulnerabilities ? []
|
||||
, doCheck ? true, ...
|
||||
, branch, sha256, version, patches ? [], knownVulnerabilities ? [], ...
|
||||
}:
|
||||
|
||||
/* Maintainer notes:
|
||||
|
@ -188,13 +187,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
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
|
||||
'';
|
||||
doCheck = false; # fails
|
||||
|
||||
# ffmpeg 3+ generates pkg-config (.pc) files that don't have the
|
||||
# form automatically handled by the multiple-outputs hooks.
|
||||
|
|
Loading…
Reference in New Issue