diff options
author | Ross MacLeod <rmm-github@z.odi.ac> | 2017-06-12 00:29:51 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-22 17:53:52 -0400 |
commit | d016637629e16548a98c9c570136d8ba60e8c9cd (patch) | |
tree | f5e36a5f3dd150eae7ff207ad4f92456a962c867 | |
parent | 29c4d7f505c39930f0d457c9ba4570d6a768f67c (diff) |
podofo: unsimplify derivation a bit to avoid hash breakage
-rw-r--r-- | pkgs/development/libraries/podofo/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index fde5c5e489c13..84709441b5e71 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 , openssl, libpng, lua5, pkgconfig, libidn, expat +, gcc5 # TODO(@Dridus) remove this at next hash break }: stdenv.mkDerivation rec { @@ -12,9 +13,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; - nativeBuildInputs = [ cmake pkgconfig ]; + # TODO(@Dridus) remove the ++ ghc5 at next hash break + nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5; - buildInputs = [ lua5 ]; + # TODO(@Dridus) remove the ++ libc at next hash break + buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc; cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; |