From a3b3a7ffb18e6abd33cd30206791e0cfd29a48d4 Mon Sep 17 00:00:00 2001 From: 2chilled Date: Mon, 20 Mar 2017 11:39:53 +0100 Subject: [PATCH] rawtherapee: 5.0-r1 -> 5.0-r1 with gtk3 support (#22911) --- pkgs/applications/graphics/rawtherapee/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 53fdc67cf24..97d04b03622 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx +{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau +, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -9,15 +9,17 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; - rev = "1077c4ba2e2dbe249884e6974c6050db8eb5e9c2"; - sha256 = "1xqmkwprk3h9nhy6q562mkjdpynyg9ff7a92sdga50k56gi0aj0s"; + rev = version + "-gtk3"; + sha256 = "06v3ir5562yg4zk9z8kc8a7sw7da88193sizjlk74gh5d3smgr4q"; }; buildInputs = [ - pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx + pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp + lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx ]; + nativeBuildInputs = [ wrapGAppsHook ]; + cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" ];