diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-23 11:13:20 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-23 11:13:20 +0400 |
| commit | e4f9e321ca284ad6ebd4babbd12d7750fe507fd3 (patch) | |
| tree | 07ce2cf66e237640558bd9fddab9e1ce6a399645 /pkgs | |
| parent | 8acf6aa48affb19cc8425d5ad982f1984397b9d6 (diff) | |
| parent | 86c283824f76d849acbe6f97c34250c8c5533499 (diff) | |
| download | nixlib-e4f9e321ca284ad6ebd4babbd12d7750fe507fd3.tar nixlib-e4f9e321ca284ad6ebd4babbd12d7750fe507fd3.tar.gz nixlib-e4f9e321ca284ad6ebd4babbd12d7750fe507fd3.tar.bz2 nixlib-e4f9e321ca284ad6ebd4babbd12d7750fe507fd3.tar.lz nixlib-e4f9e321ca284ad6ebd4babbd12d7750fe507fd3.tar.xz nixlib-e4f9e321ca284ad6ebd4babbd12d7750fe507fd3.tar.zst nixlib-e4f9e321ca284ad6ebd4babbd12d7750fe507fd3.zip | |
Merge pull request #3069 from danielzinn/add_cuda_6
Allowing cuda to use its own thrust library
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/cudatoolkit/5.5.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/cudatoolkit/6.0.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/cudatoolkit/setup-hook.sh | 8 |
3 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix index 99f0828012fa..bf4009f08be3 100644 --- a/pkgs/development/compilers/cudatoolkit/5.5.nix +++ b/pkgs/development/compilers/cudatoolkit/5.5.nix @@ -51,8 +51,11 @@ stdenv.mkDerivation rec { perl ./install-linux.pl --prefix="$out" rm $out/tools/CUDA_Occupancy_Calculator.xls perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + mv $out/include $out/usr_include ''; + setupHook = ./setup-hook.sh; + meta = { license = [ "nonfree" ]; }; diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix index 573cc8262216..5da4b3d0a4aa 100644 --- a/pkgs/development/compilers/cudatoolkit/6.0.nix +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -51,8 +51,11 @@ stdenv.mkDerivation rec { perl ./install-linux.pl --prefix="$out" rm $out/tools/CUDA_Occupancy_Calculator.xls perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + mv $out/include $out/usr_include ''; + setupHook = ./setup-hook.sh; + meta = { license = [ "nonfree" ]; }; diff --git a/pkgs/development/compilers/cudatoolkit/setup-hook.sh b/pkgs/development/compilers/cudatoolkit/setup-hook.sh new file mode 100644 index 000000000000..1b75a2e91ba2 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/setup-hook.sh @@ -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) |