From 53fa11cfc9e5b6c87fdd2ce1d7170120367ff46f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Jun 2013 12:52:47 +0200 Subject: [PATCH] poppler: attempt to fix missing libiconv on non-Linux --- pkgs/development/libraries/poppler/0.18.nix | 4 ++-- pkgs/development/libraries/poppler/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix index 3297b0a19e6..29e99b67549 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 +, libxml2, pkgconfig, cmake, lcms2, libiconvOrEmpty , glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted , qt4Support ? false, qt4 ? null }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional gtk3Support gtk3 ++ stdenv.lib.optional qt4Support qt4; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 2807b298856..8e168c2f411 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, pkgconfig, cmake +{ stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty , 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 ]; + nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";