Merge pull request #123341 from dotlambda/vivaldi-ffmpeg
vivaldi: use ffmpeg instead of ffmpeg_3
This commit is contained in:
commit
aaaab99d8c
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence
|
{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence
|
||||||
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
|
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
|
||||||
, alsaLib, dbus, cups, libexif, ffmpeg_3, systemd
|
, alsaLib, dbus, cups, libexif, ffmpeg, systemd
|
||||||
, freetype, fontconfig, libXft, libXrender, libxcb, expat
|
, freetype, fontconfig, libXft, libXrender, libxcb, expat
|
||||||
, libuuid
|
, libuuid
|
||||||
, libxml2
|
, libxml2
|
||||||
|
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence
|
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence
|
||||||
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
|
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
|
||||||
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd
|
atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd
|
||||||
freetype fontconfig libXrender libuuid expat glib nss nspr
|
freetype fontconfig libXrender libuuid expat glib nss nspr
|
||||||
libxml2 pango cairo gnome2.GConf
|
libxml2 pango cairo gnome2.GConf
|
||||||
libdrm mesa
|
libdrm mesa
|
||||||
|
|
Loading…
Reference in a new issue