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

keep lcms versioning in all-packages.nix

Browse Source
This commit is contained in:
Mathijs Kwik
2013-06-29 16:07:15 +02:00
parent 6937609391
commit 04cbaef102
8 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libcdr/default.nix
View File

@@ -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 ];

4
pkgs/development/libraries/openjpeg/default.nix
View File

@@ -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;

4
pkgs/development/libraries/poppler/0.18.nix
View File

@@ -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

4
pkgs/development/libraries/poppler/default.nix
View File

@@ -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;