diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:18:54 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:18:54 +0200 |
commit | b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1 (patch) | |
tree | 1665938bf023545db2afcf42d924a47d7f2918b2 /pkgs/tools/graphics | |
parent | 9f8a7d26798ced69f3185a59383bbb3db6b06bde (diff) | |
parent | c860babfe6a512aa7c7e83751547347a137ecd67 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/appleseed/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index 87686108720..d7603c42fca 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -24,7 +24,16 @@ in stdenv.mkDerivation rec { osl seexpr makeWrapper ]; - NIX_CFLAGS_COMPILE = "-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR -I${openimageio.dev}/include/OpenImageIO -Wno-unused-but-set-variable"; + NIX_CFLAGS_COMPILE = [ + "-I${openexr.dev}/include/OpenEXR" + "-I${ilmbase.dev}/include/OpenEXR" + "-I${openimageio.dev}/include/OpenImageIO" + + "-Wno-unused-but-set-variable" + "-Wno-error=class-memaccess" + "-Wno-error=maybe-uninitialized" + "-Wno-error=catch-value" + ]; cmakeFlags = [ "-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON" |