From f32979e2d8de33f83404e68d357cb2257350bd90 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2012 14:43:42 -0400 Subject: [PATCH] Revert "cups: Drop unused dependencies and add libusb1 dependency" This reverts commit 6f700142c4a5794b349e6233c3e964a3de15407e. --- pkgs/misc/cups/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index bf55182058b7..630183805806 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, zlib, pam, openssl, dbus, libusb1, acl }: +{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl +, dbus, libusb, acl }: let version = "1.6.1"; in @@ -12,7 +13,7 @@ stdenv.mkDerivation { sha256 = "143pk8a0kqqr7m9j0b8c9h2nn0zf6awpivk7wq7iclz68h8snhjq"; }; - buildInputs = [ pkgconfig zlib libusb1 ] + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ; propagatedBuildInputs = [ openssl ];