diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-06-15 23:05:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-15 23:05:39 +0100 |
commit | 9dcda45b9bd0699d831803a464b0f63a2fd787ca (patch) | |
tree | 9088927db435724672546f178d76d8eed0f87d98 /pkgs/tools/graphics | |
parent | 0bb6d7a106acafda48fa3a71a97e673e34cf5a44 (diff) | |
parent | f87b23a966d46dfcc77ea6a203479f79c8d5cf02 (diff) |
Merge pull request #89755 from wamserma/luxcorerender-py36
luxcorerender: dependency: python35 -> python36
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/luxcorerender/default.nix | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index fc8a98c19930..3afb6ebd9877 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre @@ -7,28 +7,34 @@ , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp }: -let boost_static = boost165.override { - python = python35; +let + python = python36; + + boost_static = boost165.override { + inherit python; enableStatic = true; enablePython = true; }; + version = "2.0"; + sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + in stdenv.mkDerivation { pname = "luxcorerender"; - version = "2.0"; + inherit version; src = fetchFromGitHub { owner = "LuxCoreRender"; repo = "LuxCore"; - rev = "luxcorerender_v2.0"; - sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + rev = "luxcorerender_v${version}"; + inherit sha256; }; buildInputs = [ embree2 pkgconfig cmake zlib boost_static libjpeg libtiff libpng ilmbase freetype openexr openimageio tbb qt5.full c-blosc libGLU pcre bison - flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon + flex libX11 libpthreadstubs python libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gtk3 @@ -43,15 +49,15 @@ in stdenv.mkDerivation { "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR" "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include" - "-DPYTHON_LIBRARY=${python35}/lib/libpython3.so" - "-DPYTHON_INCLUDE_DIR=${python35}/include/python3.5" + "-DPYTHON_LIBRARY=${python}/lib/libpython3.so" + "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.pythonVersion}" "-DEMBREE_INCLUDE_PATH=${embree2}/include" "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" ] ++ stdenv.lib.optional withOpenCL "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; preConfigure = '' - NIX_CFLAGS_COMPILE+=" -isystem ${python35}/include/python3.5" + NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}" NIX_LDFLAGS+=" -lpython3" ''; |