Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

luxcorerender: init at 2.0, embree: init at 2.17.4 #42334

Merged
merged 1 commit into from
Jun 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 27 additions & 0 deletions pkgs/development/libraries/embree/2.x.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw,
openimageio, libjpeg, libpng, libpthreadstubs, libX11
}:

stdenv.mkDerivation rec {
name = "embree-${version}";
version = "2.17.4";

src = fetchFromGitHub {
owner = "embree";
repo = "embree";
rev = "v2.17.4";
sha256 = "0q3r724r58j4b6cbyy657fsb78z7a2c7d5mwdp7552skynsn2mn9";
};

cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ];
enableParallelBuilding = true;

buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ];
meta = with stdenv.lib; {
description = "High performance ray tracing kernels from Intel";
homepage = https://embree.github.io/;
maintainers = with maintainers; [ hodapp ];
license = licenses.asl20;
platforms = platforms.linux;
};
}
87 changes: 87 additions & 0 deletions pkgs/tools/graphics/luxcorerender/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
, dbus, doxygen, qt5, c-blosc, mesa_glu, gnome3, pcre
, bison, flex, libpthreadstubs, libX11
, embree2, makeWrapper, gsettings_desktop_schemas, glib
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
}:

let boost_static = boost165.override {
python = python35;
enableStatic = true;
};

in stdenv.mkDerivation rec {
name = "luxcorerender-${version}";
version = "2.0";

src = fetchFromGitHub {
owner = "LuxCoreRender";
repo = "LuxCore";
rev = "luxcorerender_v2.0";
sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38";
};

buildInputs =
[ embree2 pkgconfig cmake zlib boost_static libjpeg
libtiff libpng ilmbase freetype openexr openimageio
tbb qt5.full c-blosc mesa_glu pcre bison
flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
epoxy at-spi2-core dbus doxygen
# needed for GSETTINGS_SCHEMAS_PATH
gsettings_desktop_schemas glib gnome3.gtk
# needed for XDG_ICON_DIRS
gnome3.defaultIconTheme
makeWrapper
(stdenv.lib.getLib gnome3.dconf)
] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp];

cmakeFlags = [
"-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
"-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"
"-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_LDFLAGS+=" -lpython3"
'';

installPhase = ''
mkdir -p $out/bin
mkdir -p $out/lib
cp -va bin/* $out/bin
cp -va lib/* $out/lib
'';

preFixup = ''
wrapProgram "$out/bin/luxcoreui" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
'';

meta = with stdenv.lib; {
description = "Open source, physically based, unbiased rendering engine";
homepage = https://luxcorerender.org/;
maintainers = with maintainers; [ hodapp ];
license = licenses.asl20;
platforms = platforms.linux;
};
}


# TODO (might not be necessary):
#
# luxcoreui still gives warnings like: "failed to commit changes to
# dconf: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The
# name ca.desrt.dconf was not provided by any .service files"

# CMake complains of the FindOpenGL/GLVND preference
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2227,6 +2227,8 @@ with pkgs;
callPackage ../servers/search/elasticsearch/plugins.nix { }
);

embree2 = callPackage ../development/libraries/embree/2.x.nix { };

emem = callPackage ../applications/misc/emem { };

emv = callPackage ../tools/misc/emv { };
Expand Down Expand Up @@ -3690,6 +3692,8 @@ with pkgs;

lzip = callPackage ../tools/compression/lzip { };

luxcorerender = callPackage ../tools/graphics/luxcorerender { };

xz = callPackage ../tools/compression/xz { };

lz4 = callPackage ../tools/compression/lz4 { };
Expand Down