summary refs log tree commit diff
path: root/pkgs/development/misc
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/misc
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/misc')
-rw-r--r--pkgs/development/misc/amdapp-sdk/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix
index 021c84fee0f1..02cf9b03bd77 100644
--- a/pkgs/development/misc/amdapp-sdk/default.nix
+++ b/pkgs/development/misc/amdapp-sdk/default.nix
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
 
   patchFlags = "-p0";
   buildInputs = [ makeWrapper perl mesa xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ];
-  propagatedBuildInputs = [ stdenv.gcc ];
+  propagatedBuildInputs = [ stdenv.cc ];
   NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm";
   doCheck = false;
 
@@ -81,13 +81,13 @@ in stdenv.mkDerivation rec {
       cp -r "./samples/opencl/bin/${arch}/"* "$out/samples/opencl/bin"
       for f in $(find "$out/samples/opencl/bin/" -type f -not -name "*.*");
       do
-        wrapProgram "$f" --prefix PATH ":" "${stdenv.gcc}/bin"
+        wrapProgram "$f" --prefix PATH ":" "${stdenv.cc}/bin"
       done'' else ""
     }
 
     # Create wrappers
-    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/clinfo
-    patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/bin/clinfo
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo
+    patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib $out/bin/clinfo
 
     # Fix modes
     find "$out/" -type f -exec chmod 644 {} \;