about summary refs log tree commit diff
path: root/pkgs/development/interpreters/pypy
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2014-12-17 12:11:30 -0600
committerJohn Wiegley <johnw@newartisans.com>2014-12-26 11:06:21 -0600
commit28b6fb61e651a3e2cca57d087781e7ba6ab45e7c (patch)
tree1931763370f483739474ebe0ab219eb0d7256c13 /pkgs/development/interpreters/pypy
parentce100a5d58799e65684ad948db70638c311369b3 (diff)
downloadnixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar
nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.gz
nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.bz2
nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.lz
nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.xz
nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.zst
nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.zip
Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
Diffstat (limited to 'pkgs/development/interpreters/pypy')
-rw-r--r--pkgs/development/interpreters/pypy/2.4/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix
index 5f00950a9589..c5d86766d1f0 100644
--- a/pkgs/development/interpreters/pypy/2.4/default.nix
+++ b/pkgs/development/interpreters/pypy/2.4/default.nix
@@ -22,13 +22,13 @@ let
     };
 
     buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]
-      ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc
+      ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
       ++ stdenv.lib.optional zlibSupport zlib;
 
     C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs);
     LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
     LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") 
-      (stdenv.lib.filter (x : x.outPath != stdenv.gcc.libc.outPath or "") buildInputs));
+      (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs));
 
     preConfigure = ''
       substituteInPlace Makefile \