diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-09-16 22:38:31 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-09-16 22:45:22 +0200 |
commit | afc0218ecdefc905cd034c5bdfd369739fa5bc80 (patch) | |
tree | 5e5e8c3cc728efc6d02f6bf886e8e60a0d5bdd3c /pkgs/development/libraries/opensubdiv | |
parent | bb1c9b027d343f2ce263496582d6b56af8af92e6 (diff) | |
download | nixpkgs-afc0218ecdefc905cd034c5bdfd369739fa5bc80.tar nixpkgs-afc0218ecdefc905cd034c5bdfd369739fa5bc80.tar.gz nixpkgs-afc0218ecdefc905cd034c5bdfd369739fa5bc80.tar.bz2 nixpkgs-afc0218ecdefc905cd034c5bdfd369739fa5bc80.tar.lz nixpkgs-afc0218ecdefc905cd034c5bdfd369739fa5bc80.tar.xz nixpkgs-afc0218ecdefc905cd034c5bdfd369739fa5bc80.tar.zst nixpkgs-afc0218ecdefc905cd034c5bdfd369739fa5bc80.zip |
blender: Fix CUDA support
CUDA toolkit 8 doesn't support gcc 6, so we have to build opensubdiv and blender with gcc 5.
Diffstat (limited to 'pkgs/development/libraries/opensubdiv')
-rw-r--r-- | pkgs/development/libraries/opensubdiv/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index e91fd0e60ff..ef979996a47 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu +{ lib, stdenv, stdenv_gcc5, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu , mesa_noglu, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit }: -stdenv.mkDerivation rec { +(if cudaSupport then stdenv_gcc5 else stdenv).mkDerivation rec { name = "opensubdiv-${version}"; version = "3.2.0"; |