diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-05-30 20:08:00 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-22 17:53:52 -0400 |
| commit | 29c4d7f505c39930f0d457c9ba4570d6a768f67c (patch) | |
| tree | e89748756f241d6157a4b6f51479bb9de82c033f /pkgs/development/libraries/podofo | |
| parent | f55ccbb60fb1022ce9d27595fc8200dd1d0da6db (diff) | |
podofo: Simplify derivation
Bunch of junk for linux and cross compilation that's no longer needed
Diffstat (limited to 'pkgs/development/libraries/podofo')
| -rw-r--r-- | pkgs/development/libraries/podofo/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 1ba8235403346..fde5c5e489c13 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig -, gcc5, openssl, libpng, lua5, pkgconfig, libidn, expat }: +, openssl, libpng, lua5, pkgconfig, libidn, expat +}: stdenv.mkDerivation rec { name = "podofo-0.9.5"; @@ -11,17 +12,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; - # Does Linux really need gcc5? Darwin doesn't seem to... - nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5; + nativeBuildInputs = [ cmake pkgconfig ]; - # 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 - libtiff.crossDrv fontconfig.crossDrv openssl.crossDrv libpng.crossDrv - lua5.crossDrv stdenv.ccCross.libc ]; - }; + buildInputs = [ lua5 ]; cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; |