keep lcms versioning in all-packages.nix

This commit is contained in:
Mathijs Kwik
2013-07-01 07:52:13 +02:00
parent 6937609391
commit 04cbaef102
8 changed files with 21 additions and 17 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl
, lcms2, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
, lcms, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty
, x11Support, x11 ? null
, cupsSupport ? false, cups ? null
, gnuFork ? true
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms2
libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms
libpaper jbig2dec expat
] ++ stdenv.lib.optionals x11Support [x11 freetype]
++ stdenv.lib.optional cupsSupport cups