Merge pull request #24970 from romildo/upd.vivaldi

vivaldi: 1.6.689.34-1 -> 1.8.770.56-1
This commit is contained in:
Jörg Thalheim 2017-04-17 22:16:07 +02:00 committed by GitHub
commit 00fa9c7a53

View File

@ -10,16 +10,16 @@
}: }:
let let
version = "1.6"; version = "1.8";
build = "689.34-1"; build = "770.56-1";
fullVersion = "stable_${version}.${build}"; fullVersion = "stable_${version}.${build}";
info = if stdenv.is64bit then { info = if stdenv.is64bit then {
arch = "amd64"; arch = "amd64";
sha256 = "0wn98nzlhppmm3g797kiqr9bxxff8l7l110f1w1fnfl93d325hrm"; sha256 = "1f9cwr41rl0mqwg3xn2nfb5xnr0h0vc4wiz8367bd67zf4an61d2";
} else { } else {
arch = "i386"; arch = "i386";
sha256 = "0agybibfwk5n1gxi8g4rbvvmlq5963df5arz4fyi4a1hcayllaz0"; sha256 = "1240w3gqn5rbvkb0v1g66syrc92r1vzk82fkmvy92qsnx0d5z7nn ";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -47,7 +47,8 @@ in stdenv.mkDerivation rec {
libPath = stdenv.lib.makeLibraryPath buildInputs libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.is64bit) + stdenv.lib.optionalString (stdenv.is64bit)
(":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs)
+ ":$out/opt/vivaldi/lib";
buildPhase = '' buildPhase = ''
echo "Patching Vivaldi binaries" echo "Patching Vivaldi binaries"