diff options
| author | Domen Kožar <domen@dev.si> | 2014-12-07 14:52:36 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-12-07 14:56:18 +0100 |
| commit | 4124a0bd9c900ec4b481cae8786cae44f93bad41 (patch) | |
| tree | 6ef221f985a788a548719d635db1a288cd74262e /pkgs/applications/networking/browsers | |
| parent | 9c90498b1fdfbcd0bda50e71c07cb973f5c3955f (diff) | |
chromium: enable cups by default
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index dea816e5be9bf..be227fe05793e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,7 +13,7 @@ , bison, gperf , glib, gtk, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa -, protobuf, speechd, libXdamage +, protobuf, speechd, libXdamage, cups # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -25,7 +25,7 @@ , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome_keyring3 ? null , proprietaryCodecs ? true -, cupsSupport ? false +, cupsSupport ? true , pulseSupport ? false, pulseaudio ? null , hiDPISupport ? false @@ -117,7 +117,7 @@ let ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux - ++ optional cupsSupport libgcrypt + ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport pulseaudio; # XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 75d5f1c248e97..8e397d819195d 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -10,7 +10,7 @@ , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false -, cupsSupport ? false +, cupsSupport ? true , pulseSupport ? false , hiDPISupport ? false }: |