diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/distcc/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 03fc9badb05..653354f9159 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk}: +{stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk, static ? false}: let name = "distcc"; version = "3.1"; @@ -15,7 +15,8 @@ stdenv.mkDerivation { '' configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing" CXXFLAGS="-O2 -fno-strict-aliasing" - --with${if popt == null then "" else "out"}-included-popt + ${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 gtk != null then "" else "out"}-gtk --without-gnome diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7082a8c6049..cd6f4c0a7f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2749,10 +2749,12 @@ let }; distcc = import ../development/tools/misc/distcc { - inherit fetchurl stdenv popt python; + inherit fetchurl stdenv popt; + python = if getPkgConfig "distcc" "python" true then python else null; avahi = if getPkgConfig "distcc" "avahi" false then avahi else null; pkgconfig = if getPkgConfig "distcc" "gtk" false then pkgconfig else null; gtk = if getPkgConfig "distcc" "gtk" false then gtkLibs.gtk else null; + static = getPkgConfig "distcc" "static" false; }; docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { |