cudatoolkit: Fix gcc -> cc

Urgh, we shouldn't have renamed gcc to cc...
This commit is contained in:
Eelco Dolstra 2015-03-04 22:08:32 +01:00
parent 829479d1dd
commit 97fcb33ac2

View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
gtk2 glib fontconfig freetype unixODBC alsaLib gtk2 glib fontconfig freetype unixODBC alsaLib
]; ];
rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64"; rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
unpackPhase = '' unpackPhase = ''
sh $src --keep --noexec sh $src --keep --noexec
@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
find . -type f -executable -exec patchelf \ find . -type f -executable -exec patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
'{}' \; || true '{}' \; || true
find . -type f -exec patchelf \ find . -type f -exec patchelf \
--set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \
--force-rpath \ --force-rpath \
'{}' \; || true '{}' \; || true
''; '';