Merge pull request #98988 from 7c6f434c/wpsoffice-ffmpeg

wpsoffice: keep using ffmpeg_3
This commit is contained in:
Michael Raskin 2020-09-28 05:49:22 +00:00 committed by GitHub
commit 064e082296
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -12,7 +12,7 @@
, cups , cups
, dbus , dbus
, expat , expat
, ffmpeg , ffmpeg_3
, fontconfig , fontconfig
, freetype , freetype
, gdk-pixbuf , gdk-pixbuf
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
cairo cairo
dbus.lib dbus.lib
expat expat
ffmpeg ffmpeg_3
fontconfig fontconfig
freetype freetype
gdk-pixbuf gdk-pixbuf