Skip to content

Commit

Permalink
podofo: fix on LLVM 4
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
copumpkin committed Apr 7, 2017
1 parent 0cacae6 commit 1be61d1
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions pkgs/development/libraries/podofo/default.nix
Expand Up @@ -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
Expand Down

0 comments on commit 1be61d1

Please sign in to comment.