diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2021-05-06 22:52:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-06 22:52:29 +0200 |
commit | cc0cc48e5d4988e30aa717f14b8230e1ffa055e2 (patch) | |
tree | eecc3d6d8256e7cc1e31726dc63f6b8639548bfb /pkgs/development | |
parent | 408a6e41639a99b43c7664ef26451fbe3575d27e (diff) | |
parent | dacdfa874e66850fe9b2dd71edc7c40246e7ae08 (diff) |
Merge pull request #121890 from cmm/distcc-2021-03-11
distcc: 2016-02-24 -> 2021-03-11
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/misc/distcc/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 38ddc1ff43127..6de12a84522ef 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -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 |