diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
| commit | 8213ff161c461655aaff7d43984384dbca64b312 (patch) | |
| tree | 3b7c3138ff2222b9b6b8d247c3b1a0c8ea3305e3 /pkgs/applications/networking/browsers/vivaldi/default.nix | |
| parent | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (diff) | |
| parent | e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133 (diff) | |
| download | nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.gz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.bz2 nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.lz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.xz nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.zst nixlib-8213ff161c461655aaff7d43984384dbca64b312.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/browsers/vivaldi/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/vivaldi/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 14a8bfd048b4..c9486d9a7271 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd +, alsaLib, dbus, cups, libexif, ffmpeg, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst-plugins-base, libxml2 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd + atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; |