@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
1+{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36
22, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
33, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
44, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre
@@ -7,28 +7,34 @@
77, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
88}:
99
10−let boost_static = boost165.override {
11− python = python35;
10+let
11+ python = python36;
12+
13+ boost_static = boost165.override {
14+ inherit python;
1215 enableStatic = true;
1316 enablePython = true;
1417 };
1518
19+ version = "2.0";
20+ sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38";
21+
1622in stdenv.mkDerivation {
1723 pname = "luxcorerender";
18− version = "2.0";
24+ inherit version;
1925
2026 src = fetchFromGitHub {
2127 owner = "LuxCoreRender";
2228 repo = "LuxCore";
23− rev = "luxcorerender_v2.0";
24− sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38";
29+ rev = "luxcorerender_v${version}";
30+ inherit sha256;
2531 };
2632
2733 buildInputs =
2834 [ embree2 pkgconfig cmake zlib boost_static libjpeg
2935 libtiff libpng ilmbase freetype openexr openimageio
3036 tbb qt5.full c-blosc libGLU pcre bison
31− flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
37+ flex libX11 libpthreadstubs python libXdmcp libxkbcommon
3238 epoxy at-spi2-core dbus doxygen
3339 # needed for GSETTINGS_SCHEMAS_PATH
3440 gsettings-desktop-schemas glib gtk3
@@ -43,15 +49,15 @@ in stdenv.mkDerivation {
4349 "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR"
4450 "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
4551 "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include"
46− "-DPYTHON_LIBRARY=${python35}/lib/libpython3.so"
47− "-DPYTHON_INCLUDE_DIR=${python35}/include/python3.5"
52+ "-DPYTHON_LIBRARY=${python}/lib/libpython3.so"
53+ "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.pythonVersion}"
4854 "-DEMBREE_INCLUDE_PATH=${embree2}/include"
4955 "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so"
5056 "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so"
5157 ] ++ stdenv.lib.optional withOpenCL
5258 "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include";
5359 preConfigure = ''
54− NIX_CFLAGS_COMPILE+=" -isystem ${python35}/include/python3.5"
60+ NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}"
5561 NIX_LDFLAGS+=" -lpython3"
5662 '';
5763