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

Merge pull request #59933 from risicle/ris-appleseed-bump-fix

Browse Source 
appleseed: 1.9.0-beta -> 2.0.5-beta (fixes build)
This commit is contained in:
Silvan Mosberger 2019-04-24 02:25:05 +02:00 committed by GitHub
commit 613fd44128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile,
eigen, libpng, python, libGLU, qt4, openexr, openimageio, eigen, libpng, python, libGLU, qt4, openexr, openimageio,
opencolorio, xercesc, ilmbase, osl, seexpr opencolorio, xercesc, ilmbase, osl, seexpr, makeWrapper
}: }:
let boost_static = boost165.override { let boost_static = boost165.override {
@ -10,21 +10,21 @@ let boost_static = boost165.override {
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "appleseed-${version}"; name = "appleseed-${version}";
version = "1.9.0-beta"; version = "2.0.5-beta";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "appleseedhq"; owner = "appleseedhq";
repo = "appleseed"; repo = "appleseed";
rev = "1.9.0-beta"; rev = version;
sha256 = "0m7zvfkdjfn48zzaxh2wa1bsaj4l876a05bzgmjlfq5dz3202anr"; sha256 = "1sq9s0rzjksdn8ayp1g17gdqhp7fqks8v1ddd3i5rsl96b04fqx5";
}; };
buildInputs = [ buildInputs = [
cmake pkgconfig boost_static guile eigen libpng python cmake pkgconfig boost_static guile eigen libpng python
libGLU qt4 openexr openimageio opencolorio xercesc libGLU qt4 openexr openimageio opencolorio xercesc
osl seexpr osl seexpr makeWrapper
]; ];
NIX_CFLAGS_COMPILE = "-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR -I${openimageio.dev}/include/OpenImageIO"; NIX_CFLAGS_COMPILE = "-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR -I${openimageio.dev}/include/OpenImageIO -Wno-unused-but-set-variable";
cmakeFlags = [ cmakeFlags = [
"-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON" "-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON"
@ -49,6 +49,7 @@ in stdenv.mkDerivation rec {
# Work around a bug in the CMake build: # Work around a bug in the CMake build:
postInstall = '' postInstall = ''
chmod a+x $out/bin/* chmod a+x $out/bin/*
wrapProgram $out/bin/appleseed.studio --set PYTHONHOME ${python}
''; '';
} }