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

Merge branch 'master' into staging-next

Browse Source 
Hydra: ?compare=1468896
This commit is contained in:
Vladimír Čunát
2018-07-14 18:15:30 +02:00
parent 4bd4e3ef5c 6d0578934f
commit 0f01215203
721 changed files with 20508 additions and 20874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/luxcorerender/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ 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
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre
, bison, flex, libpthreadstubs, libX11
, embree2, makeWrapper, gsettings_desktop_schemas, glib
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
buildInputs =
[ embree2 pkgconfig cmake zlib boost_static libjpeg
libtiff libpng ilmbase freetype openexr openimageio
tbb qt5.full c-blosc mesa_glu pcre bison
tbb qt5.full c-blosc libGLU pcre bison
flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
epoxy at-spi2-core dbus doxygen
# needed for GSETTINGS_SCHEMAS_PATH