non-Linux: more adjustments

Also reordered stuff in all-packages.nix.
This commit is contained in:
Vladimír Čunát
2013-06-18 23:59:23 +02:00
parent 83dee22f4a
commit 1f81984293
6 changed files with 20 additions and 21 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty
{ stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty
, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg
, qt4Support ? false, qt4 ? null
}:
@@ -28,7 +28,7 @@ let
propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ];
nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty;
nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty ++ libintlOrEmpty;
cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";