public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chromium: enable cups by default

Browse Source
This commit is contained in:
Domen Kožar 2014-12-07 14:52:36 +01:00
parent 9c90498b1f
commit 4124a0bd9c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -13,7 +13,7 @@
, bison, gperf , bison, gperf
, glib, gtk, dbus_glib , glib, gtk, dbus_glib
, libXScrnSaver, libXcursor, libXtst, mesa , libXScrnSaver, libXcursor, libXtst, mesa
, protobuf, speechd, libXdamage , protobuf, speechd, libXdamage, cups
# optional dependencies # optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport , libgcrypt ? null # gnomeSupport || cupsSupport
@ -25,7 +25,7 @@
, gnomeSupport ? false, gnome ? null , gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false, libgnome_keyring3 ? null , gnomeKeyringSupport ? false, libgnome_keyring3 ? null
, proprietaryCodecs ? true , proprietaryCodecs ? true
, cupsSupport ? false , cupsSupport ? true
, pulseSupport ? false, pulseaudio ? null , pulseSupport ? false, pulseaudio ? null
, hiDPISupport ? false , hiDPISupport ? false
@ -117,7 +117,7 @@ let
] ++ optional gnomeKeyringSupport libgnome_keyring3 ] ++ optional gnomeKeyringSupport libgnome_keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optional enableSELinux libselinux ++ optional enableSELinux libselinux
++ optional cupsSupport libgcrypt ++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport pulseaudio; ++ optional pulseSupport pulseaudio;
# XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to # XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to

2
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -10,7 +10,7 @@
, proprietaryCodecs ? true , proprietaryCodecs ? true
, enablePepperFlash ? false , enablePepperFlash ? false
, enableWideVine ? false , enableWideVine ? false
, cupsSupport ? false , cupsSupport ? true
, pulseSupport ? false , pulseSupport ? false
, hiDPISupport ? false , hiDPISupport ? false
}: }: