public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vivaldi: 1.9.818.44-1 -> 1.10.867.38-1

Browse Source 
- Update to version 1.10.867.38-1
- Drop i386 arch. Vivaldi has suspended support for Linux 32-bit for
  Vivaldi 1.10. Unfortunately, this is due to Chromium suspending support
  for it and maintaining it themselves would take too much resources.
  See https://forum.vivaldi.net/post/142489.
- Update dependency on gtk2 to gtk3.
- Move dependency patchelf from buildInputs to nativeBuildInputs.
This commit is contained in:
romildo 2017-06-18 08:45:17 -03:00
parent 10d0213d3f
commit f6763c80e1
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/applications/networking/browsers/vivaldi/default.nix
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";
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}"; name = "${product}-${version}";
product = "vivaldi";
version = "1.10.867.38-1";
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,13 +24,14 @@ 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
buildInputs = [
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 gtk3 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr freetype fontconfig libXrender libuuid expat glib nss nspr
gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
patchelf
]; ];
libPath = stdenv.lib.makeLibraryPath buildInputs libPath = stdenv.lib.makeLibraryPath buildInputs
@ -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" ];
}; };
} }