Merge pull request #17685 from matthewbauer/darwin-misc2

Darwin misc. fixes
This commit is contained in:
Daniel Peebles
2016-08-24 11:52:27 +02:00
committed by GitHub
44 changed files with 162 additions and 49 deletions

View File

@@ -16,6 +16,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";

View File

@@ -8,6 +8,8 @@ stdenv.mkDerivation {
sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6";
};
buildFlags = [ "CC=cc" ];
installPhase = ''
# Manually copy, make install copies to /usr/local/bin
mkdir -pv $out/bin/

View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildPhase = ''
gcc tie.c -o tie
cc tie.c -o tie
'';
installPhase = ''