Merge remote-tracking branch 'upstream/master' into HEAD

2 files changed, 8 insertions, 3 deletions

diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index 20c01f77bbf8c..318c2caee6f1f 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@@ -11,6 +11,10 @@ python27Packages.buildPythonApplication rec {
 
     propagatedBuildInputs = with python27Packages; [ pygtk pillow ];
 
+    postPatch = ''
+      sed -i -e '/test_suite/d' setup.py
+    '';
+
     meta = {
       description = "Image viewer designed to handle comic books";
 
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 97d04b0362287..3edb97e3e2092 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.0-r1";
+  version = "5.2";
   name = "rawtherapee-" + version;
 
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
-    rev = version + "-gtk3";
-    sha256 = "06v3ir5562yg4zk9z8kc8a7sw7da88193sizjlk74gh5d3smgr4q";
+    rev = version;
+    sha256 = "0i3cr3335bw8yxxzn6kcdx6ccinlnxzrdbgl3ld1kym1w2n5449k";
   };
 
   buildInputs = [
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DPROC_TARGET_NUMBER=2"
+    "-DCACHE_NAME_SUFFIX=\"\""
   ];
 
   CMAKE_CXX_FLAGS = "-std=c++11 -Wno-deprecated-declarations -Wno-unused-result";