mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 15:56:50 +01:00
blender, openimageio: build with gcc6 again
I tried upgrading openimagio instead, but that didn't fix the blender build (blender is the only non-broken dependency ATM). This way blender starts.
This commit is contained in:
parent
837de09605
commit
5beae8347a
1 changed files with 4 additions and 1 deletions
|
@ -14543,6 +14543,7 @@ with pkgs;
|
||||||
blender = callPackage ../applications/misc/blender {
|
blender = callPackage ../applications/misc/blender {
|
||||||
cudaSupport = config.cudaSupport or false;
|
cudaSupport = config.cudaSupport or false;
|
||||||
python = python35;
|
python = python35;
|
||||||
|
stdenv = overrideCC stdenv gcc6;
|
||||||
};
|
};
|
||||||
|
|
||||||
bluefish = callPackage ../applications/editors/bluefish {
|
bluefish = callPackage ../applications/editors/bluefish {
|
||||||
|
@ -16661,7 +16662,9 @@ with pkgs;
|
||||||
|
|
||||||
openfx = callPackage ../development/libraries/openfx {};
|
openfx = callPackage ../development/libraries/openfx {};
|
||||||
|
|
||||||
openimageio = callPackage ../applications/graphics/openimageio { };
|
openimageio = callPackage ../applications/graphics/openimageio {
|
||||||
|
stdenv = overrideCC stdenv gcc6;
|
||||||
|
};
|
||||||
|
|
||||||
openjump = callPackage ../applications/misc/openjump { };
|
openjump = callPackage ../applications/misc/openjump { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue