Merge pull request #20205 from womfoo/bump/k3d-0.8.0.6

k3d: 0.8.0.5 -> 0.8.0.6
This commit is contained in:
Tim Steinbach 2016-11-09 21:34:42 -05:00 committed by GitHub
commit f7c288507a

View file

@ -1,18 +1,25 @@
{ stdenv, fetchFromGitHub, unzip, ftgl, glew, asciidoc { stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc
, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , cmake, mesa, 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 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.8.0.5"; version = "0.8.0.6";
name = "k3d-${version}"; name = "k3d-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "K-3D"; owner = "K-3D";
repo = "k3d"; repo = "k3d";
rev = name; rev = name;
sha256 = "0q05d51vhnmrq887n15frpwkhx8w7n20h2sc1lpr338jzpryihb3"; sha256 = "0vdjjg6h8mxm2n8mvkkg2mvd27jn2xx90hnmx23cbd35mpz9p4aa";
}; };
patches = [
(fetchpatch { /* glibmm 2.50 fix */
url = https://github.com/K-3D/k3d/commit/c65889d0652490d88a573e47de7a9324bf27bff2.patch;
sha256 = "162icv1hicr2dirkb9ijacvg9bhz5j30yfwg7b45ijavk8rns62j";
})
];
cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false"; cmakeFlags = "-DK3D_BUILD_DOCS=false -DK3D_BUILD_GUIDE=false";
preConfigure = '' preConfigure = ''
@ -33,7 +40,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A 3D editor with support for procedural editing"; description = "A 3D editor with support for procedural editing";
homepage = "http://k-3d.org/"; homepage = http://www.k-3d.org/;
platforms = with stdenv.lib.platforms; platforms = with stdenv.lib.platforms;
linux; linux;
maintainers = with stdenv.lib.maintainers; maintainers = with stdenv.lib.maintainers;