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

luxcorerender: Fix build

Browse Source 
CL/cl.hpp was missing which made the build fail.
This commit is contained in:
Sandro Jäckel 2020-12-31 16:01:21 +01:00
parent 9b2ddc9ad0
commit 5d1c04d97e
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36 { stdenv, fetchFromGitHub, cmake, boost165, pkg-config, 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
, bison, flex, libpthreadstubs, libX11 , bison, flex, libpthreadstubs, libX11
, embree2, makeWrapper, gsettings-desktop-schemas, glib , embree2, makeWrapper, gsettings-desktop-schemas, glib
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp, rocm-opencl-runtime
}: }:
let let
@ -30,19 +30,21 @@ in stdenv.mkDerivation {
inherit sha256; inherit sha256;
}; };
buildInputs = nativeBuildInputs = [ cmake pkg-config];
[ embree2 pkgconfig cmake zlib boost_static libjpeg
libtiff libpng ilmbase freetype openexr openimageio buildInputs = [
tbb qt5.full c-blosc libGLU pcre bison embree2 zlib boost_static libjpeg
flex libX11 libpthreadstubs python libXdmcp libxkbcommon libtiff libpng ilmbase freetype openexr openimageio
epoxy at-spi2-core dbus doxygen tbb qt5.full c-blosc libGLU pcre bison
# needed for GSETTINGS_SCHEMAS_PATH flex libX11 libpthreadstubs python libXdmcp libxkbcommon
gsettings-desktop-schemas glib gtk3 epoxy at-spi2-core dbus doxygen
# needed for XDG_ICON_DIRS # needed for GSETTINGS_SCHEMAS_PATH
gnome3.adwaita-icon-theme gsettings-desktop-schemas glib gtk3
makeWrapper # needed for XDG_ICON_DIRS
(stdenv.lib.getLib dconf) gnome3.adwaita-icon-theme
] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; makeWrapper
(stdenv.lib.getLib dconf)
] ++ stdenv.lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ];
cmakeFlags = [ cmakeFlags = [
"-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
@ -55,7 +57,8 @@ in stdenv.mkDerivation {
"-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 ${python}/include/python${python.pythonVersion}" NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}"
NIX_LDFLAGS+=" -lpython3" NIX_LDFLAGS+=" -lpython3"