Merge branch 'pr/cuda-sdk' of git://github.com/dguibert/nixpkgs

This commit is contained in:
Petr Rockai 2014-01-29 18:36:15 +01:00
commit 7c24880b4c

View file

@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
} }
else throw "cudatoolkit does not support platform ${stdenv.system}"; else throw "cudatoolkit does not support platform ${stdenv.system}";
outputs = [ "out" "sdk" ];
buildInputs = [ perl ]; buildInputs = [ perl ];
runtimeDependencies = [ runtimeDependencies = [
@ -30,6 +32,7 @@ stdenv.mkDerivation rec {
sh $src --keep --noexec sh $src --keep --noexec
cd pkg/run_files cd pkg/run_files
sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec
sh cuda-samples-linux-5.5.22-16488124.run --keep --noexec
cd pkg cd pkg
''; '';
@ -44,8 +47,9 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
mkdir $out mkdir $out $sdk
perl ./install-linux.pl --prefix="$out" perl ./install-linux.pl --prefix="$out"
perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
''; '';
meta = { meta = {