diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
commit | ee04ffcb550809f7d97d709ff4ec709a21b30ab9 (patch) | |
tree | 470bdb3f97b0ab18d3abeec3e1f59db7a4af34ed /pkgs/development/tools/misc/distcc/default.nix | |
parent | 3f1a32c266f792290cb08c45ab40f22a43cb13cb (diff) | |
parent | 97d4a54698a4dea4b57ec4124591d75a740ee44e (diff) | |
download | nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.gz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.bz2 nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.lz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.xz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.zst nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.zip |
Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
Diffstat (limited to 'pkgs/development/tools/misc/distcc/default.nix')
-rw-r--r-- | pkgs/development/tools/misc/distcc/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index e372350e3846..b81cb9223bc3 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { '' configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing" CXXFLAGS="-O2 -fno-strict-aliasing" + --mandir=$out/share/man ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"} ${if static then "LDFLAGS=-static" else ""} --with${if static == true || popt == null then "" else "out"}-included-popt |