From 1744733be8082e42908f3f8ebc046ac1dd70fcdc Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Wed, 14 Sep 2011 17:58:57 +0000
Subject: [PATCH] Revering CUPS update.

svn path=/nixos/trunk/; revision=29283
---
 modules/services/printing/cupsd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index c5f611b0e94..1fb5ee6dd2d 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -125,10 +125,10 @@ in
 
     environment.etc =
       [ # CUPS expects the following files in its ServerRoot.
-        { source = "${cups}/share/cups/mime/mime.convs";
+        { source = "${cups}/etc/cups/mime.convs";
           target = "cups/mime.convs";
         }
-        { source = "${cups}/share/cups/mime/mime.types";
+        { source = "${cups}/etc/cups/mime.types";
           target = "cups/mime.types";
         }
       ];
@@ -153,7 +153,7 @@ in
       };
 
     services.printing.drivers = [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends ];
-
+    
     services.printing.cupsdConf =
       ''
         LogLevel info