diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-11 14:52:36 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-11 14:52:36 +0200 |
| commit | 5787ac63649e4e3f11b70f44fa66c7b304956c86 (patch) | |
| tree | 995eca15bb4618928317d9a2237c2e1234bc57fe /pkgs | |
| parent | 2c9fa335218e34a12fdb92d58f58975fd83e5b60 (diff) | |
| download | nixpkgs-5787ac63649e4e3f11b70f44fa66c7b304956c86.tar nixpkgs-5787ac63649e4e3f11b70f44fa66c7b304956c86.tar.gz nixpkgs-5787ac63649e4e3f11b70f44fa66c7b304956c86.tar.bz2 nixpkgs-5787ac63649e4e3f11b70f44fa66c7b304956c86.tar.lz nixpkgs-5787ac63649e4e3f11b70f44fa66c7b304956c86.tar.xz nixpkgs-5787ac63649e4e3f11b70f44fa66c7b304956c86.tar.zst nixpkgs-5787ac63649e4e3f11b70f44fa66c7b304956c86.zip | |
cups: Split into multiple outputs
However, splitting off the client library from the server-side stuff still remains to be done.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 6cc13aa3013..d479e6e6971 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 b1993376fc4..153504507c2 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 { }; |