diff options
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/opensubdiv/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 10 insertions, 4 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; { 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aefc3f1443..3fdfa50b75a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9912,6 +9912,7 @@ with pkgs; }; opensubdiv = callPackage ../development/libraries/opensubdiv { + stdenv_gcc5 = overrideCC stdenv gcc5; cmake = cmake_2_8; }; @@ -13619,6 +13620,7 @@ with pkgs; bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { + stdenv_gcc5 = overrideCC stdenv gcc5; python = python35; }; |