nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 08:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: enable basic tests

Browse Source
This commit is contained in:
Robert Scott 2021-08-17 22:55:39 +01:00
parent d3795a31f1
commit 649f0ed1a8
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/ffmpeg/2.8.nix
View File

@ -7,4 +7,5 @@ callPackage ./generic.nix (rec {
knownVulnerabilities = [ knownVulnerabilities = [
"CVE-2021-30123" "CVE-2021-30123"
]; ];
doCheck = false;
} // args) } // args)

11
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -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.