about summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorviric <viric@viric.name>2012-09-21 06:06:43 -0700
committerviric <viric@viric.name>2012-09-21 06:06:43 -0700
commit383336a5633aa4c129900ce2dcf760c9f1fdb5a1 (patch)
tree0295666b7a1100c38787e75c56f7bcf64375e954 /pkgs/applications/misc
parent309ec44f404e30ede5cfcdbd01b614da5ff771c3 (diff)
parent8cb034fd30b4d9742c48a2f5d1e07fd697bb501b (diff)
downloadnixlib-383336a5633aa4c129900ce2dcf760c9f1fdb5a1.tar
nixlib-383336a5633aa4c129900ce2dcf760c9f1fdb5a1.tar.gz
nixlib-383336a5633aa4c129900ce2dcf760c9f1fdb5a1.tar.bz2
nixlib-383336a5633aa4c129900ce2dcf760c9f1fdb5a1.tar.lz
nixlib-383336a5633aa4c129900ce2dcf760c9f1fdb5a1.tar.xz
nixlib-383336a5633aa4c129900ce2dcf760c9f1fdb5a1.tar.zst
nixlib-383336a5633aa4c129900ce2dcf760c9f1fdb5a1.zip
Merge pull request #128 from MarcWeber/fixes/blender
fix blender build and enable parallel building
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/blender/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index e8307a79cf75..828d55ad4789 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
     "-DPYTHON_LIBPATH=${python}/lib"
   ];
 
-  NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}";
+
+  enableParallelBuilding = true;
 
   meta = {
     description = "3D Creation/Animation/Publishing System";