diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-04 22:08:32 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-03-04 22:15:46 +0100 |
| commit | 97fcb33ac2a148ecb315935bf4d430e44e1ea6f9 (patch) | |
| tree | 88475610c21ff6eace9e5add5a8a499ae349db81 | |
| parent | 829479d1dda5dbb579885e16dc655716127457ed (diff) | |
| download | nixlib-97fcb33ac2a148ecb315935bf4d430e44e1ea6f9.tar nixlib-97fcb33ac2a148ecb315935bf4d430e44e1ea6f9.tar.gz nixlib-97fcb33ac2a148ecb315935bf4d430e44e1ea6f9.tar.bz2 nixlib-97fcb33ac2a148ecb315935bf4d430e44e1ea6f9.tar.lz nixlib-97fcb33ac2a148ecb315935bf4d430e44e1ea6f9.tar.xz nixlib-97fcb33ac2a148ecb315935bf4d430e44e1ea6f9.tar.zst nixlib-97fcb33ac2a148ecb315935bf4d430e44e1ea6f9.zip | |
cudatoolkit: Fix gcc -> cc
Urgh, we shouldn't have renamed gcc to cc...
| -rw-r--r-- | pkgs/development/compilers/cudatoolkit/6.5.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/6.5.nix b/pkgs/development/compilers/cudatoolkit/6.5.nix index 9f9d3bc94bfb..17156cd06647 100644 --- a/pkgs/development/compilers/cudatoolkit/6.5.nix +++ b/pkgs/development/compilers/cudatoolkit/6.5.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { 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 = '' sh $src --keep --noexec @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { buildPhase = '' 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 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 \ '{}' \; || true ''; |