JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cups: keep versioning in all-packages.nix, as it is in master

Browse Source
This commit is contained in:
Mathijs Kwik 2013-08-22 08:24:13 +02:00
parent 32d823d3d0
commit 6ced9298c7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/misc/cups/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
, dbus, libusb1, acl }: , dbus, libusb, acl }:
let version = "1.5.4"; in let version = "1.5.4"; in
@ -16,7 +16,7 @@ stdenv.mkDerivation {
# FIXME: Split off the cups client library. # FIXME: Split off the cups client library.
outputs = [ "dev" "out" "doc" "man" ]; outputs = [ "dev" "out" "doc" "man" ];
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ] buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ]
++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
propagatedBuildInputs = [ openssl ]; propagatedBuildInputs = [ openssl ];

1
pkgs/top-level/all-packages.nix
View File

@ -9630,6 +9630,7 @@ let
cups = callPackage ../misc/cups { cups = callPackage ../misc/cups {
stdenv = stdenvMulti; stdenv = stdenvMulti;
libusb = libusb1;
}; };
cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { }; cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { };