3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

5 commits

Author SHA1 Message Date
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
Thomas Tuegel b120a737fd rPackages.BayesLogit: build with openblas 2015-06-09 11:43:00 -05:00
Nikolay Amiantov 8450ff3ab8 rPackages: fix broken packages 2015-02-19 23:53:36 +03:00
taku0 4647743ed7 cran-packages: updated sources 2014-12-03 16:28:28 +01:00
taku0 2a1d9ddbf2 cran-packages: restructured 2014-12-03 16:28:28 +01:00