distcc: 2016-02-24 -> 2021-03-11
This commit is contained in:
parent
123db83348
commit
dacdfa874e
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk2, runCommand
|
{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk3, runCommand
|
||||||
, gcc, autoconf, automake, which, procps, libiberty_static
|
, gcc, autoconf, automake, which, procps, libiberty_static
|
||||||
, runtimeShell
|
, runtimeShell
|
||||||
, sysconfDir ? "" # set this parameter to override the default value $out/etc
|
, sysconfDir ? "" # set this parameter to override the default value $out/etc
|
||||||
|
@ -7,18 +7,18 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
name = "distcc";
|
name = "distcc";
|
||||||
version = "2016-02-24";
|
version = "2021-03-11";
|
||||||
distcc = stdenv.mkDerivation {
|
distcc = stdenv.mkDerivation {
|
||||||
name = "${name}-${version}";
|
name = "${name}-${version}";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "distcc";
|
owner = "distcc";
|
||||||
repo = "distcc";
|
repo = "distcc";
|
||||||
rev = "b2fa4e21b4029e13e2c33f7b03ca43346f2cecb8";
|
rev = "de21b1a43737fbcf47967a706dab4c60521dbbb1";
|
||||||
sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6";
|
sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [popt avahi pkg-config python3 gtk2 autoconf automake which procps libiberty_static];
|
buildInputs = [popt avahi pkg-config python3 gtk3 autoconf automake 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)
|
||||||
|
@ -30,7 +30,7 @@ let
|
||||||
${if static then "LDFLAGS=-static" else ""}
|
${if static then "LDFLAGS=-static" else ""}
|
||||||
--with${if static == true || popt == null then "" else "out"}-included-popt
|
--with${if static == true || popt == null then "" else "out"}-included-popt
|
||||||
--with${if avahi != null then "" else "out"}-avahi
|
--with${if avahi != null then "" else "out"}-avahi
|
||||||
--with${if gtk2 != null then "" else "out"}-gtk
|
--with${if gtk3 != null then "" else "out"}-gtk
|
||||||
--without-gnome
|
--without-gnome
|
||||||
--enable-rfc2553
|
--enable-rfc2553
|
||||||
--disable-Werror # a must on gcc 4.6
|
--disable-Werror # a must on gcc 4.6
|
||||||
|
|
Loading…
Reference in New Issue