dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pkgs/development/tools/misc/distcc: allow users to override sysconfdir

Browse Source 
svn path=/nixpkgs/trunk/; revision=24486
This commit is contained in:
Peter Simons 2010-10-26 11:14:40 +00:00
parent 35dc7d6f3c
commit 4f784157f1
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"; let name = "distcc";
version = "3.1"; version = "3.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${name}-${version}"; name = "${name}-${version}";
src = fetchurl { src = fetchurl {
@ -15,6 +19,7 @@ stdenv.mkDerivation {
'' ''
configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing" configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"
CXXFLAGS="-O2 -fno-strict-aliasing" CXXFLAGS="-O2 -fno-strict-aliasing"
${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"}
${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
@ -22,6 +27,7 @@ stdenv.mkDerivation {
--without-gnome --without-gnome
--enable-rfc2553 --enable-rfc2553
) )
installFlags="sysconfdir=$out/etc";
''; '';
patches = [ ./20-minute-io-timeout.patch ]; patches = [ ./20-minute-io-timeout.patch ];
@ -32,5 +38,8 @@ stdenv.mkDerivation {
description = "a fast, free distributed C/C++ compiler"; description = "a fast, free distributed C/C++ compiler";
homepage = "http://distcc.org"; homepage = "http://distcc.org";
license = "GPL"; license = "GPL";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -2348,9 +2348,7 @@ let
ddd = callPackage ../development/tools/misc/ddd { }; ddd = callPackage ../development/tools/misc/ddd { };
distcc = callPackage ../development/tools/misc/distcc { distcc = callPackage ../development/tools/misc/distcc { };
static = false;
};
docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { docutils = builderDefsPackage (import ../development/tools/documentation/docutils) {
inherit python pil makeWrapper; inherit python pil makeWrapper;