4 files changed, 49 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake
new file mode 100644
index 00000000000..28096618c9e
--- /dev/null
+++ b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake
@@ -0,0 +1,4 @@
+set(GIT_BRANCH master)
+set(GIT_VERSION 4.2.1050)
+set(GIT_CHANGESET 2d0e5e4feeac9801994d82c5931531f508deb2e9)
+set(GIT_TAGDISTANCE 1050)
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 450124706c6..9259b7c7648 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation rec {
   name = "rawtherapee-4.2";
-  
+
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
     rev = "4.2";
     sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr";
   };
-  
+
   buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
     lcms2 libiptcdata mercurial libcanberra_gtk2 fftw expat pcre libsigcxx ];
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "RAW converter and digital photo processing software";
     homepage = http://www.rawtherapee.com/;
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [viric jcumming mahe];
+    maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix
new file mode 100644
index 00000000000..2d664e5cf15
--- /dev/null
+++ b/pkgs/applications/graphics/rawtherapee/dev.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau
+, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx
+}:
+
+stdenv.mkDerivation rec {
+  name = "rawtherapee-git-2016-09-21";
+
+  src = fetchFromGitHub {
+    owner = "Beep6581";
+    repo = "RawTherapee";
+    rev = "2d0e5e4feeac9801994d82c5931531f508deb2e9";
+    sha256 = "1d9bi3b6cslm0rhhqf0rx47nlnsnky284vqsxyq3mss6bd8880xh";
+  };
+
+  buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
+    lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ];
+
+  NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";
+
+  # Copy generated ReleaseInfo.cmake so we don't need git. File was
+  # generated manually using `./tools/generateReleaseInfo` in the
+  # source folder. Make sure to regenerate it when updating.
+  preConfigure = ''
+    cp ${./ReleaseInfo.cmake} ./ReleaseInfo.cmake
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "RAW converter and digital photo processing software";
+    homepage = http://www.rawtherapee.com/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4be96a76d7..a36b01f1324 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14651,6 +14651,12 @@ in
     cmake = cmake_2_8; # problems after 3.4 -> 3.6.0
   };
 
+  rawtherapee-git = lowPrio (callPackage ../applications/graphics/rawtherapee/dev.nix {
+    fftw = fftwSinglePrec;
+    cmake = cmake_2_8; # problems after 3.4 -> 3.6.0
+  });
+
+
   rcs = callPackage ../applications/version-management/rcs { };
 
   rdesktop = callPackage ../applications/networking/remote/rdesktop { };