Merge pull request #26694 from romildo/upd.vivaldi

vivaldi: 1.9.818.44-1 -> 1.10.867.38-1

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