diff options
| author | Peter Simons <simons@cryp.to> | 2011-09-14 18:20:13 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-09-14 18:20:13 +0000 |
| commit | f5e8d35f8e76755febf97ca8f62b0700a8b6d20a (patch) | |
| tree | f2f7816e52eb82a924415cd69cc322cfa987aa2d /modules/services | |
| parent | 1744733be8082e42908f3f8ebc046ac1dd70fcdc (diff) | |
| download | nixpkgs-f5e8d35f8e76755febf97ca8f62b0700a8b6d20a.tar nixpkgs-f5e8d35f8e76755febf97ca8f62b0700a8b6d20a.tar.gz nixpkgs-f5e8d35f8e76755febf97ca8f62b0700a8b6d20a.tar.bz2 nixpkgs-f5e8d35f8e76755febf97ca8f62b0700a8b6d20a.tar.lz nixpkgs-f5e8d35f8e76755febf97ca8f62b0700a8b6d20a.tar.xz nixpkgs-f5e8d35f8e76755febf97ca8f62b0700a8b6d20a.tar.zst nixpkgs-f5e8d35f8e76755febf97ca8f62b0700a8b6d20a.zip | |
modules/services/printing/cupsd.nix: /etc/cups/mime.{convs,types} are obsolete
Current versions of CUPS (1.4.7 or later, apparently) load these files
from ${cups}/share/mime, so we no longer need the symlinks in /etc.
svn path=/nixos/trunk/; revision=29284
Diffstat (limited to 'modules/services')
| -rw-r--r-- | modules/services/printing/cupsd.nix | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix index 1fb5ee6dd2d..632bdbae90d 100644 --- a/modules/services/printing/cupsd.nix +++ b/modules/services/printing/cupsd.nix @@ -123,16 +123,6 @@ in # gets loaded, and then cups cannot access the printers. boot.blacklistedKernelModules = [ "usblp" ]; - environment.etc = - [ # CUPS expects the following files in its ServerRoot. - { source = "${cups}/etc/cups/mime.convs"; - target = "cups/mime.convs"; - } - { source = "${cups}/etc/cups/mime.types"; - target = "cups/mime.types"; - } - ]; - jobs.cupsd = { description = "CUPS printing daemon"; |