BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #27265 from 239/patch-1

Browse source 
opera: 45.0.2552.898 -> 46.0.2597.39
This commit is contained in:
Jörg Thalheim 2017-07-09 22:25:50 +01:00 committed by GitHub
commit 8c3429d98f
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/applications/networking/browsers/opera/default.nix
View file

@ -12,7 +12,7 @@
, gdk_pixbuf , gdk_pixbuf
, glib , glib
, gnome2 , gnome2
, gtk2 , gtk3
, libX11 , libX11
, libxcb , libxcb
, libXScrnSaver , libXScrnSaver
@ -37,7 +37,7 @@
let let
mirror = https://get.geo.opera.com/pub/opera/desktop; mirror = https://get.geo.opera.com/pub/opera/desktop;
version = "45.0.2552.898"; version = "46.0.2597.39";
rpath = stdenv.lib.makeLibraryPath [ rpath = stdenv.lib.makeLibraryPath [
@ -55,7 +55,7 @@ let
gdk_pixbuf.out gdk_pixbuf.out
glib.out glib.out
gnome2.GConf.out gnome2.GConf.out
gtk2.out gtk3.out
libX11.out libX11.out
libXScrnSaver.out libXScrnSaver.out
libXcomposite.out libXcomposite.out
@ -88,17 +88,18 @@ in stdenv.mkDerivation {
name = "opera-${version}"; name = "opera-${version}";
src = src =
if stdenv.system == "i686-linux" then #if stdenv.system == "i686-linux" then
fetchurl { # fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb"; # url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
sha256 = "1a7y13mgc8g7swdg0x2l9h6cmqw74h2wxizi3vmlgz2fj5zlkn0g"; # sha256 = "...";
} # }
else if stdenv.system == "x86_64-linux" then #else
if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
sha256 = "0rmagj0s1j3a6rpyrs29xnbngsq700rgaqkph108fbnj80hif1ia"; sha256 = "1ladvqilm5rr222wjybvribnyii2l0p8jbsd10xr06wps63g1kia";
} }
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; else throw "Opera is not supported on ${stdenv.system} (only x86_64 linux is supported)";
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";