diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-02 15:40:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 15:40:38 -0500 |
| commit | eeb016e8f0d8934dc33db7666d841e4b85713c9a (patch) | |
| tree | 4a99561053ba51db60a75389e483784543b105ff /pkgs/development/libraries/ffmpeg | |
| parent | b4d9113fbf7ad3a09f5caa8f8fc4a9229128f1e5 (diff) | |
| parent | 3513034208aac88004e4798020cb66540a77ddad (diff) | |
| download | nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.gz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.bz2 nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.lz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.xz nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.tar.zst nixlib-eeb016e8f0d8934dc33db7666d841e4b85713c9a.zip | |
Merge branch 'staging' into fix-ncurses-darwin-extensions
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 4a05eab87bd7..7226645381b6 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -160,9 +160,10 @@ stdenv.mkDerivation rec { ++ optional vdpauSupport libvdpau ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL); - enableParallelBuilding = true; + doCheck = false; # fails + postFixup = '' moveToOutput bin "$bin" moveToOutput share/ffmpeg/examples "$doc" |