diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-04-06 23:33:14 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-04-06 23:33:14 -0400 |
| commit | 1be61d192137ad022a9e1b8fd5d1f3d76fc5bbfc (patch) | |
| tree | 7ad1bdf78a6c94997ecd32a87c079e596bdf3b09 /pkgs/development/libraries/podofo | |
| parent | 0cacae6a5f283ccc1fee8ea718d7e4bb87e6c0a3 (diff) | |
| download | nixpkgs-1be61d192137ad022a9e1b8fd5d1f3d76fc5bbfc.tar nixpkgs-1be61d192137ad022a9e1b8fd5d1f3d76fc5bbfc.tar.gz nixpkgs-1be61d192137ad022a9e1b8fd5d1f3d76fc5bbfc.tar.bz2 nixpkgs-1be61d192137ad022a9e1b8fd5d1f3d76fc5bbfc.tar.lz nixpkgs-1be61d192137ad022a9e1b8fd5d1f3d76fc5bbfc.tar.xz nixpkgs-1be61d192137ad022a9e1b8fd5d1f3d76fc5bbfc.tar.zst nixpkgs-1be61d192137ad022a9e1b8fd5d1f3d76fc5bbfc.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries/podofo')
| -rw-r--r-- | pkgs/development/libraries/podofo/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 5f5dcfb71e6..1ba82354033 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 |