From 88fe696f43d32617661d36a082ecccdba4ff9c1b Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Fri, 20 Jul 2018 14:00:01 -0400
Subject: [PATCH] appleseed: Fix non-executable items and Python bindings

---
 pkgs/tools/graphics/appleseed/default.nix | 14 ++++++++++----
 pkgs/top-level/python-packages.nix        |  5 +++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix
index 56091a89e48b..0fe6dcfbfd30 100644
--- a/pkgs/tools/graphics/appleseed/default.nix
+++ b/pkgs/tools/graphics/appleseed/default.nix
@@ -3,7 +3,10 @@ eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio,
 opencolorio, xercesc, ilmbase, osl, seexpr
 }:
 
-let boost_static = boost165.override { enableStatic = true; };
+let boost_static = boost165.override {
+  enableStatic = true;
+  enablePython = true;
+};
 in stdenv.mkDerivation rec {
 
   name = "appleseed-${version}";
@@ -28,9 +31,7 @@ in stdenv.mkDerivation rec {
       "-DUSE_EXTERNAL_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON"
       "-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON"
       "-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON"
-      "-DWITH_PYTHON2_BINDINGS=ON"
-      # TODO: Look further into this if someone needs Python 3.x:
-      # "-DWITH_PYTHON3_BINDINGS=ON"
+      "-DWITH_PYTHON=ON"
       "-DWITH_DISNEY_MATERIAL=ON"
       "-DUSE_SSE=ON"
       "-DUSE_SSE42=ON"
@@ -44,6 +45,11 @@ in stdenv.mkDerivation rec {
     license = licenses.mit;
     platforms = platforms.linux;
   };
+
+  # Work around a bug in the CMake build:
+  postInstall = ''
+    chmod a+x $out/bin/*
+  '';
 }
 
 # TODO: Is the below problematic?
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81d38de4f388..92450ad7b452 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -569,6 +569,11 @@ in {
 
   appdirs = callPackage ../development/python-modules/appdirs { };
 
+  appleseed = disabledIf isPy3k
+    (toPythonModule (pkgs.appleseed.override {
+      inherit (self) python;
+    }));
+
   application = callPackage ../development/python-modules/application { };
 
   appnope = buildPythonPackage rec {