From 836fa19651a0cbaacb9623216947e61854cc3249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 18 Aug 2015 12:22:21 +0200 Subject: [PATCH] cudatoolkit: fixup path to samples This is needed for cuda 6.5 or else nsight will not find them. In cuda 7.0 the samples are already in $out/samples. Older versions do not build due to broken dependency (python-minimal). --- pkgs/development/compilers/cudatoolkit/generic.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix index c42c8057987..d7bc718ea60 100644 --- a/pkgs/development/compilers/cudatoolkit/generic.nix +++ b/pkgs/development/compilers/cudatoolkit/generic.nix @@ -63,6 +63,11 @@ in stdenv.mkDerivation rec { # let's remove the 32-bit libraries, they confuse the lib64->lib mover rm -rf $out/lib + + # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them) + if [ -d "$out"/cuda-samples ]; then + mv "$out"/cuda-samples "$out"/samples + fi ''; setupHook = ./setup-hook.sh;