ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

cupsd service: move all default drivers to the bindir directly

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-01-17 03:38:52 +03:00
parent 06865208e8
commit 8377b4e5d6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/printing/cupsd.nix
View File

@ -33,7 +33,9 @@ let
# cupsd.conf tells cupsd to use this tree. # cupsd.conf tells cupsd to use this tree.
bindir = pkgs.buildEnv { bindir = pkgs.buildEnv {
name = "cups-progs"; name = "cups-progs";
paths = cfg.drivers; paths =
[ cups additionalBackends cups_filters pkgs.ghostscript ]
++ cfg.drivers;
pathsToLink = [ "/lib/cups" "/share/cups" "/bin" "/etc/cups" ]; pathsToLink = [ "/lib/cups" "/share/cups" "/bin" "/etc/cups" ];
postBuild = cfg.bindirCmds; postBuild = cfg.bindirCmds;
ignoreCollisions = true; ignoreCollisions = true;
@ -176,6 +178,7 @@ in
drivers = mkOption { drivers = mkOption {
type = types.listOf types.path; type = types.listOf types.path;
default = [];
example = literalExample "[ pkgs.splix ]"; example = literalExample "[ pkgs.splix ]";
description = '' description = ''
CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript 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 = services.printing.cupsFilesConf =
'' ''
SystemGroup root wheel SystemGroup root wheel