6 files changed, 100 insertions, 13 deletions
diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix
index 7b1a7f26239f..8d88e570f272 100644
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ b/pkgs/applications/graphics/cinepaint/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  NIX_LDFLAGS = "-llcms -ljpeg";
+  NIX_LDFLAGS = "-llcms -ljpeg -lX11";
 
   # NIX_CFLAGS_COMPILE = "-I.";
 
diff --git a/pkgs/applications/graphics/darktable/1.2rc1.nix b/pkgs/applications/graphics/darktable/1.2rc1.nix
new file mode 100644
index 000000000000..906240d864f6
--- /dev/null
+++ b/pkgs/applications/graphics/darktable/1.2rc1.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl
+, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
+, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
+, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
+, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
+, openexr, pixman, pkgconfig, sqlite, bash, libxslt }:
+
+assert stdenv ? glibc;
+
+stdenv.mkDerivation rec {
+  version = "1.2rc1";
+  name = "darktable-${version}";
+
+  src = fetchurl {
+    url = "http://tinyurl.com/bmwdztq";
+    name = "${name}-${version}.tar.xz";
+    sha256 = "0l3gl49bmaljrrl4zfaivvj7apxa2jm934ylq24gcms3b2whv70m";
+  };
+
+  buildInputs =
+    [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
+      ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
+      libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
+      librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
+    ];
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
+
+    substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
+  '';
+
+  cmakeFlags = [
+    "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
+    "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Virtual lighttable and darkroom for photographers";
+    homepage = http://darktable.sourceforge.net;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 9791efe5d822..aa67406d0e79 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -8,12 +8,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.1.2";
+  version = "1.1.4";
   name = "darktable-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
-    sha256 = "225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765";
+    url = "mirror://sourceforge/darktable/darktable/1.1/darktable-${version}.tar.xz";
+    sha256 = "1bzcxh8zm0xxrpifkkksv9k4xagjrzlam00yja9v9cbjlvawfszv";
   };
 
   buildInputs =
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 44d9330043fb..4a9890720a32 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -4,11 +4,11 @@
 , python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.8.2";
+  name = "gimp-2.8.4";
   
   src = fetchurl {
     url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    md5 = "b542138820ca3a41cbd63fc331907955";
+    md5 = "392592e8755d046317878d226145900f";
   };
   
   buildInputs = 
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
new file mode 100644
index 000000000000..fa7d16ccf0a7
--- /dev/null
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff
+, opencolorio, openexr, unzip
+}:
+
+stdenv.mkDerivation rec {
+  name = "oiio-${version}";
+  version = "1.1.8";
+
+  src = fetchurl {
+    url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
+    sha256 = "08a6qhplzs8kianqb1gjgrndg81h3il5531jn9g6i4940b1xispg";
+  };
+
+  buildInputs = [ 
+    boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip
+  ];
+
+  configurePhase = "";
+
+  buildPhase = ''
+    make ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 \
+      INSTALLDIR=$out dist_dir=
+  '';
+
+  installPhase = ":";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.openimageio.org;
+    description = "A library and tools for reading and writing images";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 67723dd58183..34ad7821c876 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
-, libXdmcp, lcms2, libiptcdata, expat
+, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat
 , mercurial  # Not really needed for anything, but it fails if it does not find 'hg'
 }:
 
 stdenv.mkDerivation rec {
-  name = "rawtherapee-4.0.9";
+  name = "rawtherapee-4.0.10";
   
   src = fetchurl {
-    url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.9.tar.xz;
-    sha256 = "1ll7n7gzxs00jpw3gp9xfr90lbwqafkgqpps3j5ig6mf79frpm2a";
+    url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz;
+    sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g";
   };
   
   buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
-    lcms2 libiptcdata expat mercurial ];
+    lcms2 libiptcdata mercurial libcanberra fftw expat ];
 
   # Disable the use of the RAWZOR propietary libraries
   cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "RAW converter and digital photo processing software";
     homepage = http://www.rawtherapee.com/;
-    license = "GPLv3+";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [viric jcumming];
     platforms = with stdenv.lib.platforms; linux;
   };
 }