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

poppler: attempt to fix missing libiconv on non-Linux

Browse Source
This commit is contained in:
Vladimír Čunát 2013-06-18 12:52:47 +02:00
parent efac6d8e73
commit 53fa11cfc9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib { fetchurl, stdenv, cairo, freetype, fontconfig, zlib
, libjpeg, curl, libpthreadstubs, xorg, openjpeg , libjpeg, curl, libpthreadstubs, xorg, openjpeg
, libxml2, pkgconfig, cmake, lcms2 , libxml2, pkgconfig, cmake, lcms2, libiconvOrEmpty
, glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted , glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted
, qt4Support ? false, qt4 ? null , qt4Support ? false, qt4 ? null
}: }:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional gtk3Support gtk3 ++ stdenv.lib.optional gtk3Support gtk3
++ stdenv.lib.optional qt4Support qt4; ++ stdenv.lib.optional qt4Support qt4;
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty;
cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchgit, pkgconfig, cmake { stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty
, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg , zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg
, qt4Support ? false, qt4 ? null , qt4Support ? false, qt4 ? null
}: }:
@ -28,7 +28,7 @@ let
propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ]; propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ];
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty;
cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";