diff options
Diffstat (limited to 'pkgs/development/compilers/cudatoolkit/6.0.nix')
| -rw-r--r-- | pkgs/development/compilers/cudatoolkit/6.0.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix index 5da4b3d0a4a..49a52fe5d32 100644 --- a/pkgs/development/compilers/cudatoolkit/6.0.nix +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib +{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib , xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib } : @@ -26,7 +26,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 @@ -38,10 +38,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 ''; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - license = [ "nonfree" ]; + license = lib.licenses.unfree; }; } |