summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
authorKranium Gikos Mendoza <kranium@gikos.net>2016-11-06 11:01:39 +0800
committerKranium Gikos Mendoza <kranium@gikos.net>2016-11-06 11:01:39 +0800
commit4e59b1a23c75af602f13455d8ffb6456a40e08b4 (patch)
tree7d7a871c21c220632a3a801812347df0c2c1c7b4 /pkgs/applications/graphics
parentfa4167c0a13cbe0d97b9c88d91b86845a8c4e740 (diff)
downloadnixpkgs-4e59b1a23c75af602f13455d8ffb6456a40e08b4.tar
nixpkgs-4e59b1a23c75af602f13455d8ffb6456a40e08b4.tar.gz
nixpkgs-4e59b1a23c75af602f13455d8ffb6456a40e08b4.tar.bz2
nixpkgs-4e59b1a23c75af602f13455d8ffb6456a40e08b4.tar.lz
nixpkgs-4e59b1a23c75af602f13455d8ffb6456a40e08b4.tar.xz
nixpkgs-4e59b1a23c75af602f13455d8ffb6456a40e08b4.tar.zst
nixpkgs-4e59b1a23c75af602f13455d8ffb6456a40e08b4.zip
k3d: 0.8.0.5 -> 0.8.0.6
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/k3d/default.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index a446ab5dd18..ba43a2e7f2a 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -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
 , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
 , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.0.5";
+  version = "0.8.0.6";
   name = "k3d-${version}";
   src = fetchFromGitHub {
     owner = "K-3D";
     repo = "k3d";
     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";
 
   preConfigure = ''