diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-02-14 11:16:37 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-02-14 12:59:02 +0100 |
| commit | 1a9cf94ba2ddd169f15e751cacd1847f97cdc8d3 (patch) | |
| tree | b0dcd491fc12a3177d1d53075c3bab549f8d0ce0 /pkgs/development/libraries/opensubdiv | |
| parent | 30e8d577f10048526e92d15dd3d547d2fd975b9c (diff) | |
Revert "opensubdiv: Remove cudatoolkit from the closure"
This reverts commit 6a472cf4c1b78580de79c79ca7d7b714f4d8d36e. On second thought, this is not a good idea, because it means that a CUDA-enabled Blender doesn't work on non-CUDA systems anymore (since they don't have libOpenCL.so in /run/opengl-driver). I guess a better solution will be to split cudatoolkit into multiple outputs.
Diffstat (limited to 'pkgs/development/libraries/opensubdiv')
| -rw-r--r-- | pkgs/development/libraries/opensubdiv/default.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index f5f84ee154636..b253a27a7db3a 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -39,16 +39,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - postInstall = - '' - rm $out/lib/*.a - '' + lib.optionalString cudaSupport '' - # Drop cudatoolkit reference from the closure. We'll get - # libOpenCL from /run/opengl-driver. - s=${cudatoolkit}/lib - t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) - sed -i $out/lib/libosdGPU.so.* -e "s|$s|$t|g" - ''; + postInstall = "rm $out/lib/*.a"; meta = { description = "An Open-Source subdivision surface library"; |