diff options
Diffstat (limited to 'pkgs/applications/graphics/k3d/default.nix')
-rw-r--r-- | pkgs/applications/graphics/k3d/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index e7d337d7b1f1..f204114a5813 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,31 +1,27 @@ -{stdenv, fetchurl +{ stdenv, fetchurl, unzip, ftgl, glew, asciidoc , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff -, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu -}: +, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu }: stdenv.mkDerivation rec { - version = "0.8.0.2"; + version = "0.8.0.3"; name = "k3d-${version}"; src = fetchurl { - url = "mirror://sourceforge/k3d/k3d-source-0.8.0.2.tar.bz2"; - sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x"; + url = "https://github.com/K-3D/k3d/archive/${name}.zip"; + sha256 = "09ywwvlk8hh1357pnal96kc40ma4jq7776hqk0609rgz13s6babp"; }; - - patches = [ - ./k3d_gtkmm224.patch - ./libpng-1.4.patch - ]; + + cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false"; preConfigure = '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${gtkglext}/include/gtkglext-*) -I$(echo ${gtkglext}/lib/gtkglext-*/include)" ''; buildInputs = [ cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng - boost boost.lib doxygen cairomm pkgconfig imagemagick libjpeg libtiff - gettext intltool perl + boost boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff + gettext intltool perl unzip ftgl glew asciidoc gtkmm glibmm gtkglext pangox_compat libXmu ]; |