diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-08-21 03:42:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-21 03:42:11 +0100 |
| commit | f355e8a0605e95226005bf3cb383006e7c43c46c (patch) | |
| tree | bf5c40cfae18ec2d7c9304b8a1d4b72c99f271e7 /pkgs/development/libraries/ffmpeg | |
| parent | 7195e6008aec58853c8ef77dc1c28ab0dad84387 (diff) | |
| parent | 4b658eda801752204f8be29a8f8db343d12572dc (diff) | |
Merge pull request #134726 from risicle/ris-ffmpeg-tests
ffmpeg, ffmpeg-full: enable basic tests
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/2.8.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index 6d94c2e9974b3..0df810ff10b08 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -7,4 +7,5 @@ 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 f20f169562798..876910da6d259 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -18,7 +18,8 @@ # Darwin frameworks , Cocoa, darwinFrameworks ? [ Cocoa ] # Inherit generics -, branch, sha256, version, patches ? [], knownVulnerabilities ? [], ... +, branch, sha256, version, patches ? [], knownVulnerabilities ? [] +, doCheck ? true, ... }: /* Maintainer notes: @@ -189,7 +190,13 @@ stdenv.mkDerivation rec { 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 # form automatically handled by the multiple-outputs hooks. |