diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-01-17 03:38:52 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-01-17 15:50:40 +0300 |
| commit | 8377b4e5d6e008ba528e54d0760f0aea7707d087 (patch) | |
| tree | 0db4b4a41a438b2ac8f4405be8984093af21d8ac /nixos/modules/services/printing/cupsd.nix | |
| parent | 06865208e8516099c5ae54cfcd0c0be24ac9d0b9 (diff) | |
| download | nixpkgs-8377b4e5d6e008ba528e54d0760f0aea7707d087.tar nixpkgs-8377b4e5d6e008ba528e54d0760f0aea7707d087.tar.gz nixpkgs-8377b4e5d6e008ba528e54d0760f0aea7707d087.tar.bz2 nixpkgs-8377b4e5d6e008ba528e54d0760f0aea7707d087.tar.lz nixpkgs-8377b4e5d6e008ba528e54d0760f0aea7707d087.tar.xz nixpkgs-8377b4e5d6e008ba528e54d0760f0aea7707d087.tar.zst nixpkgs-8377b4e5d6e008ba528e54d0760f0aea7707d087.zip | |
cupsd service: move all default drivers to the bindir directly
Diffstat (limited to 'nixos/modules/services/printing/cupsd.nix')
| -rw-r--r-- | nixos/modules/services/printing/cupsd.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 6f5df23f342..06de71316ec 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -33,7 +33,9 @@ let # cupsd.conf tells cupsd to use this tree. bindir = pkgs.buildEnv { name = "cups-progs"; - paths = cfg.drivers; + paths = + [ cups additionalBackends cups_filters pkgs.ghostscript ] + ++ cfg.drivers; pathsToLink = [ "/lib/cups" "/share/cups" "/bin" "/etc/cups" ]; postBuild = cfg.bindirCmds; ignoreCollisions = true; @@ -176,6 +178,7 @@ in drivers = mkOption { type = types.listOf types.path; + default = []; example = literalExample "[ pkgs.splix ]"; description = '' CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript @@ -263,11 +266,6 @@ in ]; }; - services.printing.drivers = - [ cups pkgs.ghostscript pkgs.cups_filters additionalBackends - pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep - ]; - services.printing.cupsFilesConf = '' SystemGroup root wheel |