From 22321f2e58335cd39051c9403975b1015cfa68e0 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Fri, 4 Sep 2015 12:29:22 +0200 Subject: 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. --- pkgs/development/compilers/cudatoolkit/generic.nix | 3 --- pkgs/development/compilers/cudatoolkit/setup-hook.sh | 8 -------- 2 files changed, 11 deletions(-) delete mode 100644 pkgs/development/compilers/cudatoolkit/setup-hook.sh (limited to 'pkgs/development/compilers/cudatoolkit') 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; }; diff --git a/pkgs/development/compilers/cudatoolkit/setup-hook.sh b/pkgs/development/compilers/cudatoolkit/setup-hook.sh deleted file mode 100644 index 1b75a2e91ba2..000000000000 --- a/pkgs/development/compilers/cudatoolkit/setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addIncludePath () { - if test -d "$1/usr_include" - then - export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/usr_include" - fi -} - -envHooks=(${envHooks[@]} addIncludePath) -- cgit 1.4.1