public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change occurrences of gcc to the more general cc

Browse Source 
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
This commit is contained in:
John Wiegley
2014-12-26 11:06:21 -06:00
parent ce100a5d58
commit 28b6fb61e6
252 changed files with 553 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/atftp/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }:
assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
assert stdenv.cc.gcc != null;
let
version = "0.7";
debianPatch = fetchurl {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
buildInputs = [ readline tcp_wrappers pcre makeWrapper ];
patches = [ debianPatch ];
postInstall = ''
wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}
wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}
'';
meta = {
description = "Advanced tftp tools";