git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108051 from SuperSandro2000/luxcorerender-build

luxcorerender: Fix build

commitcde761387420ba3d7c2edb579b53de76eda1ea02 authorSandro <sandro.jaeckel@gmail.com> dateWed 6 Jan 2021, 01:59 (6 years ago) parentab6dc6e5d1c04d
1 file changed+19−16
pkgs/tools/graphics/luxcorerender/default.nix+19−16
pkgs/tools/graphics/luxcorerender/default.nix+19−16
@@ -1,10 +1,10 @@
1−{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36
1+{ stdenv, fetchFromGitHub, cmake, boost165, pkg-config, 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
55, bison, flex, libpthreadstubs, libX11
66, embree2, makeWrapper, gsettings-desktop-schemas, glib
7−, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
7+, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp, rocm-opencl-runtime
88}:
99
1010let
@@ -30,19 +30,21 @@ in stdenv.mkDerivation {
3030 inherit sha256;
3131 };
3232
33− buildInputs =
34− [ embree2 pkgconfig cmake zlib boost_static libjpeg
35− libtiff libpng ilmbase freetype openexr openimageio
36− tbb qt5.full c-blosc libGLU pcre bison
37− flex libX11 libpthreadstubs python libXdmcp libxkbcommon
38− epoxy at-spi2-core dbus doxygen
39− # needed for GSETTINGS_SCHEMAS_PATH
40− gsettings-desktop-schemas glib gtk3
41− # needed for XDG_ICON_DIRS
42− gnome3.adwaita-icon-theme
43− makeWrapper
44− (stdenv.lib.getLib dconf)
45− ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp];
33+ nativeBuildInputs = [ cmake pkg-config];
34+
35+ buildInputs = [
36+ embree2 zlib boost_static libjpeg
37+ libtiff libpng ilmbase freetype openexr openimageio
38+ tbb qt5.full c-blosc libGLU pcre bison
39+ flex libX11 libpthreadstubs python libXdmcp libxkbcommon
40+ epoxy at-spi2-core dbus doxygen
41+ # needed for GSETTINGS_SCHEMAS_PATH
42+ gsettings-desktop-schemas glib gtk3
43+ # needed for XDG_ICON_DIRS
44+ gnome3.adwaita-icon-theme
45+ makeWrapper
46+ (stdenv.lib.getLib dconf)
47+ ] ++ stdenv.lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ];
4648
4749 cmakeFlags = [
4850 "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
@@ -55,7 +57,8 @@ in stdenv.mkDerivation {
5557 "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so"
5658 "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so"
5759 ] ++ stdenv.lib.optional withOpenCL
58− "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include";
60+ "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include";
61+
5962 preConfigure = ''
6063 NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}"
6164 NIX_LDFLAGS+=" -lpython3"