diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-12-25 13:40:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-25 13:40:59 -0500 |
| commit | 3efe39d2ccfda491b46c492151249a1b9ad9e5b2 (patch) | |
| tree | 75f7a039573b144df338d8d762c9df47bf99fda3 /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | b3e3daeeba30861f0dffa8ea2da1c92c8c71f988 (diff) | |
| parent | b16d72e61be1566109f162ac49d0672ebe8abd44 (diff) | |
| download | nixlib-3efe39d2ccfda491b46c492151249a1b9ad9e5b2.tar nixlib-3efe39d2ccfda491b46c492151249a1b9ad9e5b2.tar.gz nixlib-3efe39d2ccfda491b46c492151249a1b9ad9e5b2.tar.bz2 nixlib-3efe39d2ccfda491b46c492151249a1b9ad9e5b2.tar.lz nixlib-3efe39d2ccfda491b46c492151249a1b9ad9e5b2.tar.xz nixlib-3efe39d2ccfda491b46c492151249a1b9ad9e5b2.tar.zst nixlib-3efe39d2ccfda491b46c492151249a1b9ad9e5b2.zip | |
Merge pull request #75436 from taku0/flashplayer-32.0.0.303
flashplayer: 32.0.0.293 -> 32.0.0.303
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7ce1c35e9eb1..31e699161968 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -16,7 +16,7 @@ , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core -, jdk +, jre # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -124,7 +124,7 @@ let glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core - jdk.jre + jre ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] |