From 5787ac63649e4e3f11b70f44fa66c7b304956c86 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 14:52:36 +0200
Subject: [PATCH] cups: Split into multiple outputs

However, splitting off the client library from the server-side stuff
still remains to be done.
---
 pkgs/misc/cups/default.nix      | 9 +++++++++
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 6cc13aa3013a..d479e6e69718 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation {
     md5 = "de3006e5cf1ee78a9c6145ce62c4e982";
   };
 
+  # FIXME: Split off the cups client library.
+  outputs = [ "dev" "out" "doc" "man" ];
+
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ]
     ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ;
 
@@ -38,6 +41,12 @@ stdenv.mkDerivation {
       "CUPS_PRIMARY_SYSTEM_GROUP=root"
     ];
 
+  postInstall =
+    ''
+      mkdir $dev/bin
+      mv $out/bin/cups-config $dev/bin/
+    '';
+
   meta = {
     homepage = "http://www.cups.org/";
     description = "A standards-based printing system for UNIX";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1993376fc40..153504507c2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9185,7 +9185,9 @@ let
 
   auctex = callPackage ../tools/typesetting/tex/auctex { };
 
-  cups = callPackage ../misc/cups { };
+  cups = callPackage ../misc/cups {
+    stdenv = stdenvMulti;
+  };
 
   cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { };