Merge pull request #26694 from romildo/upd.vivaldi

vivaldi: 1.9.818.44-1 -> 1.10.867.38-1
This commit is contained in:
Jörg Thalheim 2017-06-18 16:33:50 +01:00 committed by GitHub
commit 413d84f9f8

View file

@ -4,31 +4,19 @@
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, xz , libuuid, xz
, gstreamer, gst-plugins-base, libxml2 , gstreamer, gst-plugins-base, libxml2
, glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
, nss, nspr , nss, nspr
, patchelf , patchelf
}: }:
let stdenv.mkDerivation rec {
version = "1.9"; name = "${product}-${version}";
build = "818.44-1"; product = "vivaldi";
fullVersion = "stable_${version}.${build}"; version = "1.10.867.38-1";
info = if stdenv.is64bit then {
arch = "amd64";
sha256 = "0apkwgd98ld5k77nplzmk67nz6mb5pi8jyrnkp96m93mr41b08bq";
} else {
arch = "i386";
sha256 = "0xyf0z1cnzmb3pv6rgsbd7jdjf1v137priz4kkymr8jgmpq0mmfx";
};
in stdenv.mkDerivation rec {
product = "vivaldi";
name = "${product}-${version}";
src = fetchurl { src = fetchurl {
inherit (info) sha256; url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
url = "https://downloads.vivaldi.com/stable/${product}-${fullVersion}_${info.arch}.deb"; sha256 = "1h3iygzvw3rb5kmn0pam6gqy9baq6l630yllff1vnvychdg8d9vi";
}; };
unpackPhase = '' unpackPhase = ''
@ -36,14 +24,15 @@ in stdenv.mkDerivation rec {
tar -xvf data.tar.xz tar -xvf data.tar.xz
''; '';
buildInputs = nativeBuildInputs = [ patchelf ];
[ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr buildInputs = [
atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
freetype fontconfig libXrender libuuid expat glib nss nspr libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
patchelf freetype fontconfig libXrender libuuid expat glib nss nspr
]; gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
];
libPath = stdenv.lib.makeLibraryPath buildInputs libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.is64bit) + stdenv.lib.optionalString (stdenv.is64bit)
@ -85,6 +74,6 @@ in stdenv.mkDerivation rec {
homepage = "https://vivaldi.com"; homepage = "https://vivaldi.com";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ otwieracz nequissimus ]; maintainers = with maintainers; [ otwieracz nequissimus ];
platforms = platforms.linux; platforms = [ "x86_64-linux" ];
}; };
} }