Merge pull request #24930 from jlesquembre/chrome_gtk3
google-chrome: from version 59 requires gtk3
This commit is contained in:
commit
1b1b9816fc
|
@ -4,7 +4,7 @@
|
||||||
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
|
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
|
||||||
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
|
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
|
||||||
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
|
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
|
||||||
, dbus_libs, gtk2, gdk_pixbuf, gcc
|
, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc
|
||||||
|
|
||||||
# command line arguments which are always set e.g "--disable-gpu"
|
# command line arguments which are always set e.g "--disable-gpu"
|
||||||
, commandLineArgs ? ""
|
, commandLineArgs ? ""
|
||||||
|
@ -47,13 +47,14 @@ let
|
||||||
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
|
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
|
||||||
libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
|
libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
|
||||||
alsaLib libXdamage libXtst libXrandr expat cups
|
alsaLib libXdamage libXtst libXrandr expat cups
|
||||||
dbus_libs gtk2 gdk_pixbuf gcc
|
dbus_libs gdk_pixbuf gcc
|
||||||
systemd
|
systemd
|
||||||
libexif
|
libexif
|
||||||
liberation_ttf curl utillinux xdg_utils wget
|
liberation_ttf curl utillinux xdg_utils wget
|
||||||
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
|
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
|
||||||
bzip2 libcap
|
bzip2 libcap
|
||||||
] ++ optional pulseSupport libpulseaudio;
|
] ++ optional pulseSupport libpulseaudio
|
||||||
|
++ (if (versionAtLeast version "59.0.0.0") then [gtk3] else [gtk2]);
|
||||||
|
|
||||||
suffix = if channel != "stable" then "-" + channel else "";
|
suffix = if channel != "stable" then "-" + channel else "";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue