From 5d1c04d97ecfc6af08fa69a53fd8f30d146277c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 31 Dec 2020 16:01:21 +0100 Subject: [PATCH] luxcorerender: Fix build CL/cl.hpp was missing which made the build fail. --- pkgs/tools/graphics/luxcorerender/default.nix | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 3afb6ebd9877..ff235c1f4485 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36 +{ stdenv, fetchFromGitHub, cmake, boost165, pkg-config, 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 , bison, flex, libpthreadstubs, libX11 , 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 @@ -30,19 +30,21 @@ in stdenv.mkDerivation { 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 python libXdmcp libxkbcommon - epoxy at-spi2-core dbus doxygen - # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk3 - # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme - makeWrapper - (stdenv.lib.getLib dconf) - ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; + nativeBuildInputs = [ cmake pkg-config]; + + buildInputs = [ + embree2 zlib boost_static libjpeg + libtiff libpng ilmbase freetype openexr openimageio + tbb qt5.full c-blosc libGLU pcre bison + flex libX11 libpthreadstubs python libXdmcp libxkbcommon + epoxy at-spi2-core dbus doxygen + # needed for GSETTINGS_SCHEMAS_PATH + gsettings-desktop-schemas glib gtk3 + # needed for XDG_ICON_DIRS + gnome3.adwaita-icon-theme + makeWrapper + (stdenv.lib.getLib dconf) + ] ++ stdenv.lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ]; cmakeFlags = [ "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" @@ -55,7 +57,8 @@ in stdenv.mkDerivation { "-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"; + "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; + preConfigure = '' NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}" NIX_LDFLAGS+=" -lpython3"