nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 19:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

luxcorerender: dependency: python35 -> python36

Browse Source
This commit is contained in:
Markus S. Wamser 2020-06-07 19:38:50 +02:00
parent adc908a873
commit f87b23a966
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/tools/graphics/luxcorerender/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre
@ -7,28 +7,34 @@
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
}: }:
let boost_static = boost165.override { let
python = python35; python = python36;
boost_static = boost165.override {
inherit python;
enableStatic = true; enableStatic = true;
enablePython = true; enablePython = true;
}; };
version = "2.0";
sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38";
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "luxcorerender"; pname = "luxcorerender";
version = "2.0"; inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "LuxCoreRender"; owner = "LuxCoreRender";
repo = "LuxCore"; repo = "LuxCore";
rev = "luxcorerender_v2.0"; rev = "luxcorerender_v${version}";
sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; inherit sha256;
}; };
buildInputs = buildInputs =
[ embree2 pkgconfig cmake zlib boost_static libjpeg [ embree2 pkgconfig cmake zlib boost_static libjpeg
libtiff libpng ilmbase freetype openexr openimageio libtiff libpng ilmbase freetype openexr openimageio
tbb qt5.full c-blosc libGLU pcre bison 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 epoxy at-spi2-core dbus doxygen
# needed for GSETTINGS_SCHEMAS_PATH # needed for GSETTINGS_SCHEMAS_PATH
gsettings-desktop-schemas glib gtk3 gsettings-desktop-schemas glib gtk3
@ -43,15 +49,15 @@ in stdenv.mkDerivation {
"-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR" "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR"
"-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
"-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include" "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include"
"-DPYTHON_LIBRARY=${python35}/lib/libpython3.so" "-DPYTHON_LIBRARY=${python}/lib/libpython3.so"
"-DPYTHON_INCLUDE_DIR=${python35}/include/python3.5" "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.pythonVersion}"
"-DEMBREE_INCLUDE_PATH=${embree2}/include" "-DEMBREE_INCLUDE_PATH=${embree2}/include"
"-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so"
"-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so"
] ++ stdenv.lib.optional withOpenCL ] ++ stdenv.lib.optional withOpenCL
"-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include";
preConfigure = '' preConfigure = ''
NIX_CFLAGS_COMPILE+=" -isystem ${python35}/include/python3.5" NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}"
NIX_LDFLAGS+=" -lpython3" NIX_LDFLAGS+=" -lpython3"
''; '';