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/os-specific/linux/nvidia-x11/builder-legacy173.sh
+1 -1
View File
@@ -81,7 +81,7 @@ installPhase() {
for i in nvidia-settings nvidia-xconfig; do
cp usr/bin/$i $out/bin/$i
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i
done
pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh
+1 -1
View File
@@ -72,7 +72,7 @@ installPhase() {
for i in nvidia-settings nvidia-xconfig; do
cp $i $out/bin/$i
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i
done
pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
+1 -1
View File
@@ -51,7 +51,7 @@ installPhase() {
for i in nvidia-settings nvidia-smi; do
cp $i $out/bin/$i
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i
done
pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.gcc];
programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ];
pkgs/os-specific/linux/nvidia-x11/legacy304.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.gcc];
programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );
pkgs/os-specific/linux/nvidia-x11/legacy340.nix
+2 -2
View File
@@ -45,9 +45,9 @@ stdenv.mkDerivation {
dontStrip = true;
glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
cudaPath = makeLibraryPath [zlib stdenv.gcc.gcc];
cudaPath = makeLibraryPath [zlib stdenv.cc.gcc];
openclPath = makeLibraryPath [zlib];
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.gcc.gcc];
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.gcc];
programPath = optionalString (!libsOnly) (makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );