svn merge ^/nixpkgs/trunk

Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863

1 files changed, 42 insertions, 0 deletions

diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
new file mode 100644
index 0000000000000..c1579579d813d
--- /dev/null
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -0,0 +1,42 @@
+{stdenv, fetchurl, gtkLibs, gnome
+  , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
+  , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
+  , gettext, intltool, perl
+  }:
+
+stdenv.mkDerivation rec {
+  version = "0.8.0.2";
+  name = "k3d-${version}";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/k3d/K-3D%20Source/K-3D%200.8.0.2/k3d-source-0.8.0.2.tar.bz2";
+    sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x";
+  };
+
+  patches = [ (fetchurl {
+    url = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-15/k3d_gtkmm224.patch";
+    sha256 = "0a81fg96zby6kidqwj6n8mhbrh0j5fpnmfh7lr6havz5r2is9ks5";
+  })
+   ];
+
+  preConfigure = ''
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
+  '';
+
+  buildInputs = with gtkLibs; with gnome; [
+     cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
+     boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext
+     intltool perl
+     gtkmm glibmm gtkglext 
+    ];
+
+  doCheck = false;
+
+  meta = {
+    description = "A 3D editor with support for procedural editing";
+    homepage = "http://k-3d.org/";
+    platforms = with stdenv.lib.platforms;
+      linux;
+    maintainers = with stdenv.lib.maintainers; 
+      [raskin];
+  };
+}