From 5beae8347ac5a36b4c5c8791d18da9f1c02eec09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Feb 2018 15:02:54 +0100 Subject: [PATCH] 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. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d76bc67c373b..b1d11516b02f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14543,6 +14543,7 @@ with pkgs; blender = callPackage ../applications/misc/blender { cudaSupport = config.cudaSupport or false; python = python35; + stdenv = overrideCC stdenv gcc6; }; bluefish = callPackage ../applications/editors/bluefish { @@ -16661,7 +16662,9 @@ with pkgs; openfx = callPackage ../development/libraries/openfx {}; - openimageio = callPackage ../applications/graphics/openimageio { }; + openimageio = callPackage ../applications/graphics/openimageio { + stdenv = overrideCC stdenv gcc6; + }; openjump = callPackage ../applications/misc/openjump { };