From 1be61d192137ad022a9e1b8fd5d1f3d76fc5bbfc Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 6 Apr 2017 23:33:14 -0400 Subject: podofo: fix on LLVM 4 Not sure if the things I made optional on Darwin are really worth keeping at all, but I don't have a Linux box handy so I'm minimizing potential damage. --- pkgs/development/libraries/podofo/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/podofo') diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 5f5dcfb71e6a8..1ba8235403346 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -10,8 +10,12 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; - nativeBuildInputs = [ cmake gcc5 pkgconfig ]; - buildInputs = [ lua5 stdenv.cc.libc ]; + + # Does Linux really need gcc5? Darwin doesn't seem to... + nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5; + + # Does Linux really need libc here? Darwin doesn't seem to... + buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc; crossAttrs = { propagatedBuildInputs = [ zlib.crossDrv freetype.crossDrv libjpeg.crossDrv -- cgit 1.4.1