3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/development/r-modules
Bjørn Forsman 22321f2e58 cudatoolkit: don't move $out/include to $out/usr_include
This effectively reverts 86c283824f
("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.
2015-09-10 10:35:40 +02:00
..
patches cudatoolkit: don't move $out/include to $out/usr_include 2015-09-10 10:35:40 +02:00
bioc-packages.nix R: regenerate CRAN and BIOC packages 2015-08-06 20:13:50 +02:00
cran-packages.nix R: regenerate CRAN and BIOC packages 2015-08-06 20:13:50 +02:00
default.nix cudatoolkit: don't move $out/include to $out/usr_include 2015-09-10 10:35:40 +02:00
generate-r-packages.R R: improve support for CRAN and Bioconductor package sets 2015-06-17 23:19:56 +02:00
generic-builder.nix rPackages: remove Xvfb where it's not needed 2015-02-19 23:49:41 +03:00
test-evaluation.nix R: improve support for CRAN and Bioconductor package sets 2015-06-17 23:19:56 +02:00
wrapper.nix R: simplify the generic builder 2014-05-04 23:54:11 +02:00