diff options
| author | Robert Scott <github@humanleg.org.uk> | 2021-08-29 20:13:37 +0100 |
|---|---|---|
| committer | Robert Scott <code@humanleg.org.uk> | 2021-08-29 20:24:06 +0100 |
| commit | efedf9a09e4dbb9a40145e142f5b513dace9a1b2 (patch) | |
| tree | 0220aff24f5ebb68db9bbd4a586e55c7e82fb875 | |
| parent | Merge #135990: openssl: 1.1.1k -> 1.1.1l (into staging-next-21.05) (diff) | |
| download | nixpkgs-efedf9a09e4dbb9a40145e142f5b513dace9a1b2.tar.gz | |
Revert "[Backport staging-21.05] ffmpeg, ffmpeg-full: enable basic tests"
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/2.8.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 11 |
3 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index ddcc81f89302..2186c154f804 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -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/ diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index 0df810ff10b0..6d94c2e9974b 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -7,5 +7,4 @@ callPackage ./generic.nix (rec { knownVulnerabilities = [ "CVE-2021-30123" ]; - doCheck = false; } // args) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 083210b1fef1..7e4a6a080987 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -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. |