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

Merge pull request #24930 from jlesquembre/chrome_gtk3

Browse Source 
google-chrome: from version 59 requires gtk3
This commit is contained in:
Benjamin Staffin 2017-04-16 12:40:40 -04:00 committed by GitHub
commit 1b1b9816fc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -4,7 +4,7 @@
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, 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"
, commandLineArgs ? ""
@ -47,13 +47,14 @@ let
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
alsaLib libXdamage libXtst libXrandr expat cups
dbus_libs gtk2 gdk_pixbuf gcc
dbus_libs gdk_pixbuf gcc
systemd
libexif
liberation_ttf curl utillinux xdg_utils wget
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
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 "";