From 4f784157f12bd22e1b96acd6313959f6cd17b99e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Oct 2010 11:14:40 +0000
Subject: [PATCH] pkgs/development/tools/misc/distcc: allow users to override
 sysconfdir

svn path=/nixpkgs/trunk/; revision=24486
---
 pkgs/development/tools/misc/distcc/default.nix | 15 ++++++++++++---
 pkgs/top-level/all-packages.nix                |  4 +---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index a46c007cf31d..e372350e3846 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -1,8 +1,12 @@
-{stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk, static ? false}:
+{ stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk
+, sysconfDir ? ""   # set this parameter to override the default value $out/etc
+, static ? false
+}:
 
-let name        = "distcc";
-    version     = "3.1";
+let name    = "distcc";
+    version = "3.1";
 in
+
 stdenv.mkDerivation {
   name = "${name}-${version}";
   src = fetchurl {
@@ -15,6 +19,7 @@ stdenv.mkDerivation {
   ''
     configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"
                           CXXFLAGS="-O2 -fno-strict-aliasing"
+                          ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"}
                           ${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
@@ -22,6 +27,7 @@ stdenv.mkDerivation {
                           --without-gnome
                           --enable-rfc2553
                          )
+    installFlags="sysconfdir=$out/etc";
   '';
   patches = [ ./20-minute-io-timeout.patch ];
 
@@ -32,5 +38,8 @@ stdenv.mkDerivation {
     description = "a fast, free distributed C/C++ compiler";
     homepage = "http://distcc.org";
     license = "GPL";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92a23c1a5eb7..2cbd7e174e7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2348,9 +2348,7 @@ let
 
   ddd = callPackage ../development/tools/misc/ddd { };
 
-  distcc = callPackage ../development/tools/misc/distcc {
-    static = false;
-  };
+  distcc = callPackage ../development/tools/misc/distcc { };
 
   docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {
     inherit python pil makeWrapper;