Merge pull request #113295 from siraben/cc-eq-cc

This commit is contained in:
Sandro
2021-02-19 19:25:41 +01:00
committed by GitHub
53 changed files with 57 additions and 57 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
substituteInPlace Makefile --replace /usr/local "$out"
'';
makeFlags = lib.optionals stdenv.isDarwin ["CC=cc"];
makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"];
patches = [
./apg.patch
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper installShellFiles ];
makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ];
makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=${stdenv.cc.targetPrefix}cc" ];
preInstall = ''
mkdir -p $out/bin
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ];
makeFlags = [ "PREFIX=$(out)" "CC=cc" ];
makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
meta = with lib; {
description = "Tests SSL/TLS services and discover supported cipher suites";
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r";
};
buildFlags = [ "CC=cc" ];
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installPhase = ''
mkdir -p $out/bin