Merge pull request #21217 from glaebhoerl/vivaldi-1.6

Vivaldi 1.6
This commit is contained in:
Joachim F 2016-12-18 22:50:41 +01:00 committed by GitHub
commit 40990841f3

View file

@ -10,16 +10,16 @@
}: }:
let let
version = "1.5"; version = "1.6";
build = "658.44-1"; build = "689.34-1";
fullVersion = "stable_${version}.${build}"; fullVersion = "stable_${version}.${build}";
info = if stdenv.is64bit then { info = if stdenv.is64bit then {
arch = "amd64"; arch = "amd64";
sha256 = "02zb9pw8h7gm0hlhk95bn8fz14x68ax2jz8g7bgzppyryq8xlg6l"; sha256 = "0wn98nzlhppmm3g797kiqr9bxxff8l7l110f1w1fnfl93d325hrm";
} else { } else {
arch = "i386"; arch = "i386";
sha256 = "1cwpmdsv4rrr13d1x017rms7cjp5zh3vpz3b44ar49ip6zj6j0a8"; sha256 = "0agybibfwk5n1gxi8g4rbvvmlq5963df5arz4fyi4a1hcayllaz0";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
''; '';
buildInputs = buildInputs =
[ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr freetype fontconfig libXrender libuuid expat glib nss nspr