diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-12-29 21:29:34 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-12-29 21:29:34 +0000 |
| commit | 1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (patch) | |
| tree | 25f168400b9192ca94a7bdb0bb19ce11f03db509 /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | 82bd3b0cbfb0af1555ed5b6b6f4edf2b6b17a144 (diff) | |
| parent | be90b35b9efbd7baaa80f367ffc41609531a8fe2 (diff) | |
| download | nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.gz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.bz2 nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.lz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.xz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.zst nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.zip | |
Merge remote-tracking branch 'nixpkgs/master' into spectrum
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 7ce1c35e9eb..31e69916196 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 ] |