22321f2e58
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.
|
||
|---|---|---|
| .. | ||
| patches | ||
| bioc-packages.nix | ||
| cran-packages.nix | ||
| default.nix | ||
| generate-r-packages.R | ||
| generic-builder.nix | ||
| test-evaluation.nix | ||
| wrapper.nix | ||