diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-12-17 12:11:30 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-12-26 11:06:21 -0600 |
| commit | 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c (patch) | |
| tree | 1931763370f483739474ebe0ab219eb0d7256c13 /pkgs/os-specific/linux/nvidia-x11 | |
| parent | ce100a5d58799e65684ad948db70638c311369b3 (diff) | |
| download | nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.gz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.bz2 nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.lz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.xz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.zst nixpkgs-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/os-specific/linux/nvidia-x11')
6 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh index 7d39dd31189..5d47df9a87a 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh @@ -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 diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh index 7771fb988f5..20666fdb061 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh @@ -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 diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh index 4291116f4ef..5d6647d1ee0 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh @@ -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 diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 9182139c0a8..79d8adfb2e1 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -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 ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index bec329a1a17..e37b4354408 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -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 ] ); diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index fd68b9aafde..7af7e63c388 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -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 ] ); |