public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121890 from cmm/distcc-2021-03-11 

distcc: 2016-02-24 -> 2021-03-11
This commit is contained in:
Maximilian Bosch 2021-05-06 22:52:29 +02:00 committed by GitHub
parent 408a6e4163 dacdfa874e
commit cc0cc48e5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/misc/distcc/default.nix
View File

@ -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
, runtimeShell
, sysconfDir ? "" # set this parameter to override the default value $out/etc
@ -7,18 +7,18 @@
let
name = "distcc";
version = "2016-02-24";
version = "2021-03-11";
distcc = stdenv.mkDerivation {
name = "${name}-${version}";
src = fetchFromGitHub {
owner = "distcc";
repo = "distcc";
rev = "b2fa4e21b4029e13e2c33f7b03ca43346f2cecb8";
sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6";
rev = "de21b1a43737fbcf47967a706dab4c60521dbbb1";
sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4";
};
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 =
''
export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)
@ -30,7 +30,7 @@ let
${if static then "LDFLAGS=-static" else ""}
--with${if static == true || popt == null then "" else "out"}-included-popt
--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
--enable-rfc2553
--disable-Werror # a must on gcc 4.6