diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2017-07-31 09:52:45 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-11 11:17:14 +0200 |
| commit | 8dc869e3400cb30bd8685128c038593a0e793b54 (patch) | |
| tree | 52efa7d0d36c71e950c99c645884330cc9ab77ad /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | 18112eea52755a72095cc53f87a1fe5f783db50b (diff) | |
| download | nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar.gz nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar.bz2 nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar.lz nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar.xz nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.tar.zst nixpkgs-8dc869e3400cb30bd8685128c038593a0e793b54.zip | |
chromium: 59.0.3071.115 -> 60.0.3112.78
get rid of outdated version branches and patches take a patch from gentoo, to fix gn bootstrapping
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 11177f3ee48..b930ab79658 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -104,23 +104,22 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk2 dbus_glib + glib gtk2 gtk3 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optional (versionAtLeast version "56.0.0.0") gtk3; + ++ optional pulseSupport libpulseaudio; patches = [ ./patches/nix_plugin_paths_52.patch + ./patches/chromium-gn-bootstrap-r8.patch # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 ./patches/fix_network_api_crash.patch - ./patches/chromium-59.0.3071.115-system_ffmpeg-1.patch - ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch - ++ optional enableWideVine ./patches/widevine.patch; + + ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX |