From 04cbaef102366be98e105a8d56c183ae7a90c1c5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 29 Jun 2013 16:07:15 +0200 Subject: keep lcms versioning in all-packages.nix --- pkgs/applications/graphics/gimp/2.8.nix | 4 ++-- pkgs/applications/office/libreoffice/default.nix | 4 ++-- pkgs/development/libraries/libcdr/default.nix | 4 ++-- pkgs/development/libraries/openjpeg/default.nix | 4 ++-- pkgs/development/libraries/poppler/0.18.nix | 4 ++-- pkgs/development/libraries/poppler/default.nix | 4 ++-- pkgs/misc/ghostscript/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 +++++++--- 8 files changed, 21 insertions(+), 17 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 4a9890720a3..10426b4a5bd 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf -, pango, cairo, freetype, fontconfig, lcms2, libpng, libjpeg, poppler, libtiff +, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper , python, pygtk, libart_lgpl, libexif, gettext, xlibs }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo - freetype fontconfig lcms2 libpng libjpeg poppler libtiff webkit + freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper python pygtk libart_lgpl libexif gettext ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index cd45f76761d..6e3f83caae3 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,7 +6,7 @@ , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, qt4, kde4, clucene_core, libcdr, lcms2, vigra +, libwpg, dbus_glib, qt4, kde4, clucene_core, libcdr, lcms, vigra , libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio , fontsConf , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ] @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk - hunspell icu jdk kde4.kdelibs lcms2 libcdr libexttextcat libiodbc libjpeg + hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat libiodbc libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index d2d68640560..1da25527ef7 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libwpg, libwpd, lcms2, pkgconfig }: +{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig }: stdenv.mkDerivation rec { name = "libcdr-0.0.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "117a8gp29xs3kin6kaisb3frsx8dwrsjgs4wq4y5hjqprzy6lwz0"; }; - buildInputs = [ libwpg libwpd lcms2 ]; + buildInputs = [ libwpg libwpd lcms ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 7fd18af450c..a47cacd62bc 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/ }: +{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, glib/*passthru only*/ }: stdenv.mkDerivation rec { name = "openjpeg-1.5.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativebuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ libpng libtiff lcms2 ]; # in closure anyway + propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway postInstall = glib.flattenInclude; diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix index 29e99b67549..123d229f2ba 100644 --- a/pkgs/development/libraries/poppler/0.18.nix +++ b/pkgs/development/libraries/poppler/0.18.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, cairo, freetype, fontconfig, zlib , libjpeg, curl, libpthreadstubs, xorg, openjpeg -, libxml2, pkgconfig, cmake, lcms2, libiconvOrEmpty +, libxml2, pkgconfig, cmake, lcms, libiconvOrEmpty , glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted , qt4Support ? false, qt4 ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = with xorg; - [ zlib cairo freetype fontconfig libjpeg lcms2 curl + [ zlib cairo freetype fontconfig libjpeg lcms curl libpthreadstubs libxml2 stdenv.gcc.libc libXau libXdmcp libxcb libXrender libXext openjpeg diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 7c392832406..55ab0da0cfd 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty -, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg +, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , qt4Support ? false, qt4 ? null }: @@ -26,7 +26,7 @@ let inherit sha256; }; - propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ]; + propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ]; nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty ++ libintlOrEmpty; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 79f36744603..24debae860a 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1e1cb19b09..5e99403130a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4393,7 +4393,7 @@ let libcdio = callPackage ../development/libraries/libcdio { }; - libcdr = callPackage ../development/libraries/libcdr { }; + libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; libchamplain = callPackage ../development/libraries/libchamplain { inherit (gnome) libsoup; @@ -5045,7 +5045,7 @@ let opal = callPackage ../development/libraries/opal {}; - openjpeg = callPackage ../development/libraries/openjpeg { }; + openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; }; openscenegraph = callPackage ../development/libraries/openscenegraph {}; @@ -5099,11 +5099,12 @@ let policykit = callPackage ../development/libraries/policykit { }; - poppler = let popplers = callPackage ../development/libraries/poppler { }; + poppler = let popplers = callPackage ../development/libraries/poppler { lcms = lcms2; }; in popplers // popplers.poppler_glib; popplerQt4 = poppler.poppler_qt4; poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { + lcms = lcms2; glibSupport = true; gtk3Support = false; qt4Support = false; @@ -7470,6 +7471,7 @@ let gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { inherit (gnome) libart_lgpl; webkit = null; + lcms = lcms2; }; gimp = gimp_2_6; @@ -7780,6 +7782,7 @@ let }; poppler = poppler_0_18; clucene_core = clucene_core_2; + lcms = lcms2; }; liferea = callPackage ../applications/networking/newsreaders/liferea { }; @@ -9420,6 +9423,7 @@ let gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { + lcms = lcms2; x11Support = false; cupsSupport = config.ghostscript.cups or true; gnuFork = config.ghostscript.gnu or false; -- cgit 1.4.1