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/applications/misc/blender/default.nix | |
| 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/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 26aa025ea62..86b2ab6eb1c 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew +{ stdenv, stdenv_gcc5, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python @@ -10,7 +10,7 @@ with lib; -stdenv.mkDerivation rec { +(if cudaSupport then stdenv_gcc5 else stdenv).mkDerivation rec { name = "blender-2.79"; src = fetchurl { @@ -65,6 +65,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; + # Since some dependencies are built with gcc 6, we need gcc 6's + # libstdc++ in our RPATH. Sigh. + NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; + enableParallelBuilding = true; meta = with stdenv.lib; { |