summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorPetr Rockai <me@mornfall.net>2014-01-29 18:36:15 +0100
committerPetr Rockai <me@mornfall.net>2014-01-29 18:36:15 +0100
commit7c24880b4c6f2f91e50f613694bb2ab32b6bfb40 (patch)
tree55775267f0f8ec15fc6be7266a94ecb40fbf6f18 /pkgs/development/compilers
parentc323f9eed4f88546fdcff6b506a44c8c0ce4168d (diff)
parent42911b19033e6e2d95dd4d74f456927cdcf8bc73 (diff)
downloadnixpkgs-7c24880b4c6f2f91e50f613694bb2ab32b6bfb40.tar
nixpkgs-7c24880b4c6f2f91e50f613694bb2ab32b6bfb40.tar.gz
nixpkgs-7c24880b4c6f2f91e50f613694bb2ab32b6bfb40.tar.bz2
nixpkgs-7c24880b4c6f2f91e50f613694bb2ab32b6bfb40.tar.lz
nixpkgs-7c24880b4c6f2f91e50f613694bb2ab32b6bfb40.tar.xz
nixpkgs-7c24880b4c6f2f91e50f613694bb2ab32b6bfb40.tar.zst
nixpkgs-7c24880b4c6f2f91e50f613694bb2ab32b6bfb40.zip
Merge branch 'pr/cuda-sdk' of git://github.com/dguibert/nixpkgs
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/cudatoolkit/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index f68f918d585..af93cb13d37 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
       }
     else throw "cudatoolkit does not support platform ${stdenv.system}";
 
+  outputs = [ "out" "sdk" ];
+
   buildInputs = [ perl ];
 
   runtimeDependencies = [
@@ -30,6 +32,7 @@ stdenv.mkDerivation rec {
     sh $src --keep --noexec
     cd pkg/run_files
     sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec
+    sh cuda-samples-linux-5.5.22-16488124.run --keep --noexec
     cd pkg
   '';
 
@@ -44,8 +47,9 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir $out
+    mkdir $out $sdk
     perl ./install-linux.pl --prefix="$out"
+    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
   '';
 
   meta = {