k3d: clean up

This commit is contained in:
Jan Tojnar
2018-04-15 17:21:23 +02:00
parent d4f97d5fed
commit cfee336c89
+10 -9
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc { stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc
, cmake, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
@@ -20,24 +20,25 @@ stdenv.mkDerivation rec {
}) })
]; ];
cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false"; cmakeFlags = [
"-DK3D_BUILD_DOCS=false"
"-DK3D_BUILD_GUIDE=false"
];
preConfigure = '' preConfigure = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)"
''; '';
nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ];
buildInputs = [ buildInputs = [
cmake libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff boost cairomm imagemagick libjpeg libtiff
gettext intltool perl unzip ftgl glew asciidoc ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu
gtkmm2 glibmm gtkglext pangox_compat libXmu
]; ];
#doCheck = false; #doCheck = false;
enableParallelBuilding = true;
meta = { meta = {
description = "A 3D editor with support for procedural editing"; description = "A 3D editor with support for procedural editing";
homepage = http://www.k-3d.org/; homepage = http://www.k-3d.org/;