Merge pull request #14259 from anderspapitto/master

distcc: add libiberty as a buildInput
This commit is contained in:
joachifm 2016-04-02 23:10:27 +00:00
commit 8c6f5ecf8f

View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand, gcc, autoconf, automake, which, procps { stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand
, gcc, autoconf, automake, which, procps, libiberty_static
, sysconfDir ? "" # set this parameter to override the default value $out/etc , sysconfDir ? "" # set this parameter to override the default value $out/etc
, static ? false , static ? false
}: }:
@ -15,7 +16,7 @@ let
sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6";
}; };
buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps]; buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps libiberty_static];
preConfigure = preConfigure =
'' ''
export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)