public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent f9d0594a44 ab91aea5ea
commit 3f4267886d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/openscenegraph/default.nix
View File

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