JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

appleseed: Fix non-executable items and Python bindings

Browse Source
This commit is contained in:
Chris Hodapp 2018-07-20 14:00:01 -04:00
parent f517b5a8dd
commit 88fe696f43
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/graphics/appleseed/default.nix
View File

@ -3,7 +3,10 @@ eigen3_3, libpng, python, libGLU, qt4, openexr, openimageio,
opencolorio, xercesc, ilmbase, osl, seexpr 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 { in stdenv.mkDerivation rec {
name = "appleseed-${version}"; 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_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON"
"-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON" "-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON"
"-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON" "-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON"
"-DWITH_PYTHON2_BINDINGS=ON" "-DWITH_PYTHON=ON"
# TODO: Look further into this if someone needs Python 3.x:
# "-DWITH_PYTHON3_BINDINGS=ON"
"-DWITH_DISNEY_MATERIAL=ON" "-DWITH_DISNEY_MATERIAL=ON"
"-DUSE_SSE=ON" "-DUSE_SSE=ON"
"-DUSE_SSE42=ON" "-DUSE_SSE42=ON"
@ -44,6 +45,11 @@ in stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
}; };
# Work around a bug in the CMake build:
postInstall = ''
chmod a+x $out/bin/*
'';
} }
# TODO: Is the below problematic? # TODO: Is the below problematic?

5
pkgs/top-level/python-packages.nix
View File

@ -569,6 +569,11 @@ in {
appdirs = callPackage ../development/python-modules/appdirs { }; appdirs = callPackage ../development/python-modules/appdirs { };
appleseed = disabledIf isPy3k
(toPythonModule (pkgs.appleseed.override {
inherit (self) python;
}));
application = callPackage ../development/python-modules/application { }; application = callPackage ../development/python-modules/application { };
appnope = buildPythonPackage rec { appnope = buildPythonPackage rec {