diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/libcdr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/openjpeg/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/poppler/0.18.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 4 |
4 files changed, 8 insertions, 8 deletions
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; |