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

podofo: Simplify derivation

Browse Source 
Bunch of junk for linux and cross compilation that's no longer needed
This commit is contained in:
John Ericson 2017-05-30 20:08:00 -04:00 committed by John Ericson
parent f55ccbb60f
commit 29c4d7f505
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/podofo/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
, gcc5, openssl, libpng, lua5, pkgconfig, libidn, expat }: , openssl, libpng, lua5, pkgconfig, libidn, expat
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "podofo-0.9.5"; name = "podofo-0.9.5";
@ -11,17 +12,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
# Does Linux really need gcc5? Darwin doesn't seem to... nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5;
# Does Linux really need libc here? Darwin doesn't seem to... buildInputs = [ lua5 ];
buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc;
crossAttrs = {
propagatedBuildInputs = [ zlib.crossDrv freetype.crossDrv libjpeg.crossDrv
libtiff.crossDrv fontconfig.crossDrv openssl.crossDrv libpng.crossDrv
lua5.crossDrv stdenv.ccCross.libc ];
};
cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";