Merge pull request #121284 from aanderse/openscenegraph

openscenegraph: update from ffmpeg_3 to ffmpeg
This commit is contained in:
Sandro 2021-05-03 17:18:40 +02:00 committed by GitHub
commit 3f4267886d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -11,7 +11,7 @@
curlSupport ? true, curl,
colladaSupport ? false, opencollada,
opencascadeSupport ? false, opencascade,
ffmpegSupport ? false, ffmpeg_3,
ffmpegSupport ? false, ffmpeg,
nvttSupport ? false, nvidia-texture-tools,
freetypeSupport ? true, freetype,
svgSupport ? false, librsvg,
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
++ lib.optional curlSupport curl
++ lib.optional colladaSupport opencollada
++ lib.optional opencascadeSupport opencascade
++ lib.optional ffmpegSupport ffmpeg_3
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional nvttSupport nvidia-texture-tools
++ lib.optional freetypeSupport freetype
++ lib.optional svgSupport librsvg