diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-11-08 21:19:49 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-11-09 00:58:33 +0100 |
| commit | 6f8a72bbff0dcdf78df96ad366f52956bcc5c7e7 (patch) | |
| tree | 4c653afd6616c2494a18b416050f27babe665fe3 | |
| parent | d2e60d1f93c037dd337f32e5d80f1b70915eca57 (diff) | |
| download | nixpkgs-6f8a72bbff0dcdf78df96ad366f52956bcc5c7e7.tar nixpkgs-6f8a72bbff0dcdf78df96ad366f52956bcc5c7e7.tar.gz nixpkgs-6f8a72bbff0dcdf78df96ad366f52956bcc5c7e7.tar.bz2 nixpkgs-6f8a72bbff0dcdf78df96ad366f52956bcc5c7e7.tar.lz nixpkgs-6f8a72bbff0dcdf78df96ad366f52956bcc5c7e7.tar.xz nixpkgs-6f8a72bbff0dcdf78df96ad366f52956bcc5c7e7.tar.zst nixpkgs-6f8a72bbff0dcdf78df96ad366f52956bcc5c7e7.zip | |
chromium: Add Gtk 3 for versions >= 56
Versions before 56 already had experimental support for Gtk 3 and since version 56, Gtk 3 _seemed_ to become the default. Although it's now requiring *both* Gtk 2 and Gtk3, so let's supply the dependency for now to get it to build. In the future however we might want to add use_gtk3 to the GN flags and get rid of Gtk 2 completely. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e70f180f489..07ad1bef25f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk2, dbus_glib +, glib, gtk2, gtk3, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage, cups @@ -100,7 +100,8 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; + ++ optional pulseSupport libpulseaudio + ++ optional (versionAtLeast version "56.0.0.0") gtk3; patches = [ ./patches/glibc-2.24.patch |