public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3069 from danielzinn/add_cuda_6 

Allowing cuda to use its own thrust library
This commit is contained in:
Michael Raskin 2014-08-23 11:13:20 +04:00
parent 8acf6aa48a 86c283824f
commit e4f9e321ca
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/cudatoolkit/5.5.nix
View File

@ -51,8 +51,11 @@ stdenv.mkDerivation rec {
perl ./install-linux.pl --prefix="$out" perl ./install-linux.pl --prefix="$out"
rm $out/tools/CUDA_Occupancy_Calculator.xls rm $out/tools/CUDA_Occupancy_Calculator.xls
perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
mv $out/include $out/usr_include
''; '';
setupHook = ./setup-hook.sh;
meta = { meta = {
license = [ "nonfree" ]; license = [ "nonfree" ];
}; };

3
pkgs/development/compilers/cudatoolkit/6.0.nix
View File

@ -51,8 +51,11 @@ stdenv.mkDerivation rec {
perl ./install-linux.pl --prefix="$out" perl ./install-linux.pl --prefix="$out"
rm $out/tools/CUDA_Occupancy_Calculator.xls rm $out/tools/CUDA_Occupancy_Calculator.xls
perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
mv $out/include $out/usr_include
''; '';
setupHook = ./setup-hook.sh;
meta = { meta = {
license = [ "nonfree" ]; license = [ "nonfree" ];
}; };

8
pkgs/development/compilers/cudatoolkit/setup-hook.sh Normal file
View File

@ -0,0 +1,8 @@
addIncludePath () {
if test -d "$1/usr_include"
then
export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/usr_include"
fi
}
envHooks=(${envHooks[@]} addIncludePath)