From a74ab8c0a1a83b4f9e204acb1be9b544c4d9b27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 27 Aug 2013 14:11:23 +0200 Subject: [PATCH] cudatoolkit: fix missing dependencies Some of the java tools failed to run (notably nsight) because of missing libraries. This fixes it. --- pkgs/development/compilers/cudatoolkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index e3f3aeb8f771..f68f918d5850 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib -, xlibs, fontconfig, freetype, unixODBC, alsaLib +, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib } : stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ ncurses expat python zlib xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext - fontconfig freetype unixODBC alsaLib + gtk2 glib fontconfig freetype unixODBC alsaLib ]; rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ '{}' \; || true find . -type f -exec patchelf \ - --set-rpath $rpath:$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_GCC/nix-support/orig-gcc)/lib \ --force-rpath \ '{}' \; || true '';