diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-09-04 12:29:22 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-09-10 10:35:40 +0200 |
commit | 22321f2e58335cd39051c9403975b1015cfa68e0 (patch) | |
tree | 0a15a269aea5103200e6a5115454178aab55f0ee /pkgs/development/compilers/cudatoolkit/generic.nix | |
parent | 220e02506fe2ad533eec8b4381f29e52326d2982 (diff) | |
download | nixlib-22321f2e58335cd39051c9403975b1015cfa68e0.tar nixlib-22321f2e58335cd39051c9403975b1015cfa68e0.tar.gz nixlib-22321f2e58335cd39051c9403975b1015cfa68e0.tar.bz2 nixlib-22321f2e58335cd39051c9403975b1015cfa68e0.tar.lz nixlib-22321f2e58335cd39051c9403975b1015cfa68e0.tar.xz nixlib-22321f2e58335cd39051c9403975b1015cfa68e0.tar.zst nixlib-22321f2e58335cd39051c9403975b1015cfa68e0.zip |
cudatoolkit: don't move $out/include to $out/usr_include
This effectively reverts 86c283824f76d849acbe6 ("If cuda headers are presented to nix [...]") and all the following workarounds that was added due to that commit. As far as I can tell[1] this hack isn't needed anymore. And moving includes to $out/usr_include causes pain for cudatoolkit users, so better get rid of it. In patches that did more than the $out/usr_include workaround, I only changed the line back to $out/include instead of re-generating the patches and fully removing the changed line. [1]: I build tested blender and caffe, and temporarily added recurseIntoAttrs to rPackages and haskellPackages so that nox-review could get proper coverage. However, many of the packages do not build even before this patch. I also built CUDA samples with cudatoolkit7 that ran fine.
Diffstat (limited to 'pkgs/development/compilers/cudatoolkit/generic.nix')
-rw-r--r-- | pkgs/development/compilers/cudatoolkit/generic.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix index d7bc718ea60f..d4970b278bbe 100644 --- a/pkgs/development/compilers/cudatoolkit/generic.nix +++ b/pkgs/development/compilers/cudatoolkit/generic.nix @@ -59,7 +59,6 @@ in 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 # let's remove the 32-bit libraries, they confuse the lib64->lib mover rm -rf $out/lib @@ -70,8 +69,6 @@ in stdenv.mkDerivation rec { fi ''; - setupHook = ./setup-hook.sh; - meta = { license = lib.licenses.unfree; }; |