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/haskell-modules/configuration-common.nix | |
| parent | 220e02506fe2ad533eec8b4381f29e52326d2982 (diff) | |
| download | nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar.gz nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar.bz2 nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar.lz nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar.xz nixpkgs-22321f2e58335cd39051c9403975b1015cfa68e0.tar.zst nixpkgs-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/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 334331af7bd..dca155e6988 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -53,7 +53,7 @@ self: super: { configureFlags = (drv.configureFlags or []) ++ pkgs.lib.optional pkgs.stdenv.is64bit "--extra-lib-dirs=${pkgs.cudatoolkit}/lib64" ++ [ "--extra-lib-dirs=${pkgs.cudatoolkit}/lib" - "--extra-include-dirs=${pkgs.cudatoolkit}/usr_include" + "--extra-include-dirs=${pkgs.cudatoolkit}/include" ]; preConfigure = '' unset CC # unconfuse the haskell-cuda configure script |