From 02bb4eb289d9ae4b9089b77939ae06d271bbd622 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 Sep 2011 20:42:21 +0000
Subject: [PATCH] modules/services/printing/cupsd.nix: MIME related config
 files have moved to share in cups 1.5

svn path=/nixos/trunk/; revision=29254
---
 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 1fb5ee6dd2d6..c5f611b0e946 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}/etc/cups/mime.convs";
+        { source = "${cups}/share/cups/mime/mime.convs";
           target = "cups/mime.convs";
         }
-        { source = "${cups}/etc/cups/mime.types";
+        { source = "${cups}/share/cups/mime/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