Merge branch 'master' into staging

2016-08-24 11:57:44 +01:00
parent f3886a6fba 4d4980d9f8
commit 78b7529ee3
46 changed files with 363 additions and 50 deletions
--- a/pkgs/development/tools/analysis/cccc/default.nix
+++ b/pkgs/development/tools/analysis/cccc/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
    substituteInPlace install/install.mak --replace /usr/local/bin $out/bin
    substituteInPlace install/install.mak --replace MKDIR=mkdir "MKDIR=mkdir -p"
  '';
+  buildFlags = [ "CCC=c++" "LD=c++" ];

  meta = {
    description = "C and C++ Code Counter";