From d016637629e16548a98c9c570136d8ba60e8c9cd Mon Sep 17 00:00:00 2001 From: Ross MacLeod Date: Mon, 12 Jun 2017 00:29:51 +0000 Subject: podofo: unsimplify derivation a bit to avoid hash breakage --- pkgs/development/libraries/podofo/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/podofo') 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"; -- cgit 1.4.1