From f5e8d35f8e76755febf97ca8f62b0700a8b6d20a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Sep 2011 18:20:13 +0000
Subject: [PATCH] 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
---
 modules/services/printing/cupsd.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 1fb5ee6dd2d6..632bdbae90d6 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";